Git 2.31.3

Signed-off-by: Junio C Hamano <gitster@pobox.com>

.cirrus.yml

@@ -2,15 +2,8 @@ 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
+    image: freebsd-12-1-release-amd64
   install_script:
     pkg install -y gettext gmake perl5
   create_user_script:

.github/workflows/check-whitespace.yml

@@ -1,9 +1,8 @@
 name: check-whitespace
 
-# Get the repository with all commits to ensure that we can analyze
-# all of the commits contributed via the Pull Request.
+# Get the repo with the commits(+1) in the series.
 # Process `git log --check` output to extract just the check errors.
-# Exit with failure upon white-space issues.
+# Add a comment to the pull request with the check errors.
 
 on:
   pull_request:
@@ -13,9 +12,15 @@ jobs:
   check-whitespace:
     runs-on: ubuntu-latest
     steps:
+    - name: Set commit count
+      shell: bash
+      run: echo "COMMIT_DEPTH=$((1+$COMMITS))" >>$GITHUB_ENV
+      env:
+        COMMITS: ${{ github.event.pull_request.commits }}
+
     - uses: actions/checkout@v2
       with:
-        fetch-depth: 0
+        fetch-depth: ${{ env.COMMIT_DEPTH }}
 
     - name: git log --check
       id: check_out
@@ -42,9 +47,25 @@ jobs:
             echo "${dash} ${etc}"
             ;;
           esac
-        done <<< $(git log --check --pretty=format:"---% h% s" ${{github.event.pull_request.base.sha}}..)
+        done <<< $(git log --check --pretty=format:"---% h% s" -${{github.event.pull_request.commits}})
 
         if test -n "${log}"
         then
+          echo "::set-output name=checkout::"${log}""
           exit 2
         fi
+
+    - name: Add Check Output as Comment
+      uses: actions/github-script@v3
+      id: add-comment
+      env:
+        log: ${{ steps.check_out.outputs.checkout }}
+      with:
+        script: |
+            await github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Whitespace errors found in workflow ${{ github.workflow }}:\n\n\`\`\`\n${process.env.log.replace(/\\n/g, "\n")}\n\`\`\``
+            })
+      if: ${{ failure() }}

.github/workflows/l10n.yml

@@ -1,105 +0,0 @@
-name: git-l10n
-
-on: [push, pull_request_target]
-
-jobs:
-  git-po-helper:
-    if: >-
-      endsWith(github.repository, '/git-po') ||
-      contains(github.head_ref, 'l10n') ||
-      contains(github.ref, 'l10n')
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Setup base and head objects
-        id: setup-tips
-        run: |
-          if test "${{ github.event_name }}" = "pull_request_target"
-          then
-            base=${{ github.event.pull_request.base.sha }}
-            head=${{ github.event.pull_request.head.sha }}
-          else
-            base=${{ github.event.before }}
-            head=${{ github.event.after }}
-          fi
-          echo "::set-output name=base::$base"
-          echo "::set-output name=head::$head"
-      - name: Run partial clone
-        run: |
-          git -c init.defaultBranch=master init --bare .
-          git remote add \
-            --mirror=fetch \
-            origin \
-            https://github.com/${{ github.repository }}
-          # Fetch tips that may be unreachable from github.ref:
-          # - For a forced push, "$base" may be unreachable.
-          # - For a "pull_request_target" event, "$head" may be unreachable.
-          args=
-          for commit in \
-            ${{ steps.setup-tips.outputs.base }} \
-            ${{ steps.setup-tips.outputs.head }}
-          do
-            case $commit in
-            *[^0]*)
-              args="$args $commit"
-              ;;
-            *)
-              # Should not fetch ZERO-OID.
-              ;;
-            esac
-          done
-          git -c protocol.version=2 fetch \
-            --progress \
-            --no-tags \
-            --no-write-fetch-head \
-            --filter=blob:none \
-            origin \
-            ${{ github.ref }} \
-            $args
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '>=1.16'
-      - name: Install git-po-helper
-        run: go install github.com/git-l10n/git-po-helper@main
-      - name: Install other dependencies
-        run: |
-          sudo apt-get update -q &&
-          sudo apt-get install -q -y gettext
-      - name: Run git-po-helper
-        id: check-commits
-        run: |
-          exit_code=0
-          git-po-helper check-commits \
-            --github-action-event="${{ github.event_name }}" -- \
-            ${{ steps.setup-tips.outputs.base }}..${{ steps.setup-tips.outputs.head }} \
-            >git-po-helper.out 2>&1 || exit_code=$?
-          if test $exit_code -ne 0 || grep -q WARNING git-po-helper.out
-          then
-            # Remove ANSI colors which are proper for console logs but not
-            # proper for PR comment.
-            echo "COMMENT_BODY<<EOF" >>$GITHUB_ENV
-            perl -pe 's/\e\[[0-9;]*m//g; s/\bEOF$//g' git-po-helper.out >>$GITHUB_ENV
-            echo "EOF" >>$GITHUB_ENV
-          fi
-          cat git-po-helper.out
-          exit $exit_code
-      - name: Create comment in pull request for report
-        uses: mshick/add-pr-comment@v1
-        if: >-
-          always() &&
-          github.event_name == 'pull_request_target' &&
-          env.COMMENT_BODY != ''
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          repo-token-user-login: 'github-actions[bot]'
-          message: >
-            ${{ steps.check-commits.outcome == 'failure' && 'Errors and warnings' || 'Warnings' }}
-            found by [git-po-helper](https://github.com/git-l10n/git-po-helper#readme) in workflow
-            [#${{ github.run_number }}](${{ env.GITHUB_SERVER_URL }}/${{ github.repository }}/actions/runs/${{ github.run_id }}):
-
-            ```
-
-            ${{ env.COMMENT_BODY }}
-
-            ```

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: CI
+name: CI/PR
 
 on: [push, pull_request]
 
@@ -7,7 +7,6 @@ env:
 
 jobs:
   ci-config:
-    name: config
     runs-on: ubuntu-latest
     outputs:
       enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }}
@@ -78,28 +77,49 @@ jobs:
             }
 
   windows-build:
-    name: win 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
+    - uses: actions/checkout@v1
+    - name: download git-sdk-64-minimal
       shell: bash
+      run: |
+        ## Get artifact
+        urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds
+        id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" |
+          jq -r ".value[] | .id")
+        download_url="$(curl "$urlbase/$id/artifacts" |
+          jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')"
+        curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \
+          -o artifacts.zip "$download_url"
+
+        ## Unzip and remove the artifact
+        unzip artifacts.zip
+        rm artifacts.zip
+    - name: build
+      shell: powershell
       env:
         HOME: ${{runner.workspace}}
+        MSYSTEM: MINGW64
         NO_PERL: 1
-      run: . /etc/profile && ci/make-test-artifacts.sh artifacts
-    - name: zip up tracked files
-      run: git archive -o artifacts/tracked.tar.gz HEAD
-    - name: upload tracked files and build artifacts
-      uses: actions/upload-artifact@v2
+      run: |
+        & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @"
+        printf '%s\n' /git-sdk-64-minimal/ >>.git/info/exclude
+
+          ci/make-test-artifacts.sh artifacts
+        "@
+    - name: upload build artifacts
+      uses: actions/upload-artifact@v1
       with:
         name: windows-artifacts
         path: artifacts
+    - name: upload git-sdk-64-minimal
+      uses: actions/upload-artifact@v1
+      with:
+        name: git-sdk-64-minimal
+        path: git-sdk-64-minimal
   windows-test:
-    name: win test
     runs-on: windows-latest
     needs: [windows-build]
     strategy:
@@ -107,44 +127,65 @@ jobs:
       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
+    - uses: actions/checkout@v1
+    - name: download build artifacts
+      uses: actions/download-artifact@v1
       with:
         name: windows-artifacts
         path: ${{github.workspace}}
-    - name: extract tracked files and build artifacts
+    - name: extract 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
+      run: tar xf artifacts.tar.gz
+    - name: download git-sdk-64-minimal
+      uses: actions/download-artifact@v1
+      with:
+        name: git-sdk-64-minimal
+        path: ${{github.workspace}}/git-sdk-64-minimal/
     - name: test
-      shell: bash
-      run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
+      shell: powershell
+      run: |
+        & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @"
+          # Let Git ignore the SDK
+          printf '%s\n' /git-sdk-64-minimal/ >>.git/info/exclude
+
+          ci/run-test-slice.sh ${{matrix.nr}} 10
+        "@
     - name: ci/print-test-failures.sh
       if: failure()
-      shell: bash
-      run: ci/print-test-failures.sh
+      shell: powershell
+      run: |
+        & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v1
       with:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   vs-build:
-    name: win+VS build
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     env:
+      MSYSTEM: MINGW64
       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'
+    - uses: actions/checkout@v1
+    - name: download git-sdk-64-minimal
+      shell: bash
+      run: |
+        ## Get artifact
+        urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds
+        id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" |
+          jq -r ".value[] | .id")
+        download_url="$(curl "$urlbase/$id/artifacts" |
+          jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')"
+        curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \
+          -o artifacts.zip "$download_url"
+
+        ## Unzip and remove the artifact
+        unzip artifacts.zip
+        rm artifacts.zip
     - name: download vcpkg artifacts
       shell: powershell
       run: |
@@ -157,65 +198,79 @@ jobs:
     - 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
+      shell: powershell
+      run: |
+        & compat\vcbuild\vcpkg_copy_dlls.bat release
+        if (!$?) { exit(1) }
     - 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
+        -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -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
+      shell: powershell
       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
+        & 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 2>&1 | grep ^tar)\"
+        "@
+    - name: upload build artifacts
+      uses: actions/upload-artifact@v1
       with:
         name: vs-artifacts
         path: artifacts
   vs-test:
-    name: win+VS test
     runs-on: windows-latest
-    needs: vs-build
+    needs: [vs-build, windows-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
+    - uses: actions/checkout@v1
+    - name: download git-sdk-64-minimal
+      uses: actions/download-artifact@v1
+      with:
+        name: git-sdk-64-minimal
+        path: ${{github.workspace}}/git-sdk-64-minimal/
+    - name: download build artifacts
+      uses: actions/download-artifact@v1
       with:
         name: vs-artifacts
         path: ${{github.workspace}}
-    - name: extract tracked files and build artifacts
+    - name: extract build artifacts
       shell: bash
-      run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz
+      run: tar xf artifacts.tar.gz
     - name: test
-      shell: bash
+      shell: powershell
       env:
+        MSYSTEM: MINGW64
         NO_SVN_TESTS: 1
-      run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
+        GIT_TEST_SKIP_REBASE_P: 1
+      run: |
+        & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @"
+          # 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 ${{matrix.nr}} 10
+        "@
     - name: ci/print-test-failures.sh
       if: failure()
-      shell: bash
-      run: ci/print-test-failures.sh
+      shell: powershell
+      run: |
+        & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v1
       with:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   regular:
-    name: ${{matrix.vector.jobname}} (${{matrix.vector.pool}})
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     strategy:
@@ -225,52 +280,35 @@ jobs:
           - jobname: linux-clang
             cc: clang
             pool: ubuntu-latest
-          - jobname: linux-sha256
-            cc: clang
-            os: ubuntu
-            pool: ubuntu-latest
           - jobname: linux-gcc
             cc: gcc
-            cc_package: gcc-8
-            pool: ubuntu-latest
-          - jobname: linux-TEST-vars
-            cc: gcc
-            os: ubuntu
-            cc_package: gcc-8
             pool: ubuntu-latest
           - jobname: osx-clang
             cc: clang
             pool: macos-latest
           - jobname: osx-gcc
             cc: gcc
-            cc_package: gcc-9
             pool: macos-latest
           - jobname: linux-gcc-default
             cc: gcc
             pool: ubuntu-latest
-          - jobname: linux-leaks
-            cc: gcc
-            pool: ubuntu-latest
     env:
       CC: ${{matrix.vector.cc}}
-      CC_PACKAGE: ${{matrix.vector.cc_package}}
       jobname: ${{matrix.vector.jobname}}
-      runs_on_pool: ${{matrix.vector.pool}}
     runs-on: ${{matrix.vector.pool}}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
     - 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
+      uses: actions/upload-artifact@v1
       with:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   dockerized:
-    name: ${{matrix.vector.jobname}} (${{matrix.vector.image}})
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     strategy:
@@ -279,11 +317,8 @@ jobs:
         vector:
         - jobname: linux-musl
           image: alpine
-        - jobname: linux32
-          os: ubuntu32
+        - jobname: Linux32
           image: daald/ubuntu32:xenial
-        - jobname: pedantic
-          image: fedora
     env:
       jobname: ${{matrix.vector.jobname}}
     runs-on: ubuntu-latest
@@ -307,38 +342,16 @@ jobs:
       jobname: StaticAnalysis
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
     - run: ci/install-dependencies.sh
     - run: ci/run-static-analysis.sh
-    - run: ci/check-directional-formatting.bash
-  sparse:
-    needs: ci-config
-    if: needs.ci-config.outputs.enabled == 'yes'
-    env:
-      jobname: sparse
-    runs-on: ubuntu-20.04
-    steps:
-    - name: Download a current `sparse` package
-      # Ubuntu's `sparse` version is too old for us
-      uses: git-for-windows/get-azure-pipelines-artifact@v0
-      with:
-        repository: git/git
-        definitionId: 10
-        artifact: sparse-20.04
-    - name: Install the current `sparse` package
-      run: sudo dpkg -i sparse-20.04/sparse_*.deb
-    - uses: actions/checkout@v2
-    - name: Install other dependencies
-      run: ci/install-dependencies.sh
-    - run: make sparse
   documentation:
-    name: documentation
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     env:
       jobname: Documentation
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
     - run: ci/install-dependencies.sh
     - run: ci/test-documentation.sh

.gitignore

@@ -33,7 +33,6 @@
 /git-check-mailmap
 /git-check-ref-format
 /git-checkout
-/git-checkout--worker
 /git-checkout-index
 /git-cherry
 /git-cherry-pick
@@ -125,6 +124,7 @@
 /git-range-diff
 /git-read-tree
 /git-rebase
+/git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
 /git-remote
@@ -162,7 +162,6 @@
 /git-stripspace
 /git-submodule
 /git-submodule--helper
-/git-subtree
 /git-svn
 /git-switch
 /git-symbolic-ref
@@ -189,7 +188,6 @@
 /gitweb/static/gitweb.min.*
 /config-list.h
 /command-list.h
-/hook-list.h
 *.tar.gz
 *.dsc
 *.deb
@@ -224,7 +222,6 @@
 *.lib
 *.res
 *.sln
-*.sp
 *.suo
 *.ncb
 *.vcproj

.mailmap

@@ -220,7 +220,6 @@ 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

.travis.yml

@@ -0,0 +1,60 @@
+language: c
+
+cache:
+  directories:
+    - $HOME/travis-cache
+
+os:
+  - linux
+  - osx
+
+osx_image: xcode10.1
+
+compiler:
+  - clang
+  - gcc
+
+matrix:
+  include:
+    - env: jobname=linux-gcc-default
+      os: linux
+      compiler:
+      addons:
+      before_install:
+    - env: jobname=linux-gcc-4.8
+      os: linux
+      dist: trusty
+      compiler:
+    - env: jobname=Linux32
+      os: linux
+      compiler:
+      addons:
+      services:
+        - docker
+      before_install:
+      script: ci/run-docker.sh
+    - env: jobname=linux-musl
+      os: linux
+      compiler:
+      addons:
+      services:
+        - docker
+      before_install:
+      script: ci/run-docker.sh
+    - env: jobname=StaticAnalysis
+      os: linux
+      compiler:
+      script: ci/run-static-analysis.sh
+      after_failure:
+    - env: jobname=Documentation
+      os: linux
+      compiler:
+      script: ci/test-documentation.sh
+      after_failure:
+
+before_install: ci/install-dependencies.sh
+script: ci/run-build-and-tests.sh
+after_failure: ci/print-test-failures.sh
+
+notifications:
+  email: false

Documentation/.gitignore

@@ -14,5 +14,4 @@ manpage-base-url.xsl
 SubmittingPatches.txt
 tmp-doc-diff/
 GIT-ASCIIDOCFLAGS
-/.build/
 /GIT-EXCLUDED-PROGRAMS

Documentation/CodingGuidelines

@@ -175,11 +175,6 @@ 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:
 
@@ -499,43 +494,11 @@ For Python scripts:
  - Where required libraries do not restrict us to Python 2, we try to
    also be compatible with Python 3.1 and later.
 
-
-Program Output
-
- We make a distinction between a Git command's primary output and
- output which is merely chatty feedback (for instance, status
- messages, running transcript, or progress display), as well as error
- messages. Roughly speaking, a Git command's primary output is that
- which one might want to capture to a file or send down a pipe; its
- chatty output should not interfere with these use-cases.
-
- As such, primary output should be sent to the standard output stream
- (stdout), and chatty output should be sent to the standard error
- stream (stderr). Examples of commands which produce primary output
- include `git log`, `git show`, and `git branch --list` which generate
- output on the stdout stream.
-
- Not all Git commands have primary output; this is often true of
- commands whose main function is to perform an action. Some action
- commands are silent, whereas others are chatty. An example of a
- chatty action commands is `git clone` with its "Cloning into
- '<path>'..." and "Checking connectivity..." status messages which it
- sends to the stderr stream.
-
- Error messages from Git commands should always be sent to the stderr
- stream.
-
-
 Error Messages
 
  - Do not end error messages with a full stop.
 
- - 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.
+ - Do not capitalize ("unable to open %s", not "Unable to open %s")
 
  - Say what the error is first ("cannot open %s", not "%s: cannot open")
 
@@ -578,51 +541,6 @@ 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.

Documentation/Makefile

@@ -2,8 +2,6 @@
 MAN1_TXT =
 MAN5_TXT =
 MAN7_TXT =
-HOWTO_TXT =
-DOC_DEP_TXT =
 TECH_DOCS =
 ARTICLES =
 SP_ARTICLES =
@@ -44,11 +42,6 @@ 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
@@ -83,14 +76,12 @@ 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)
 
 TECH_DOCS += MyFirstContribution
 TECH_DOCS += MyFirstObjectWalk
 TECH_DOCS += SubmittingPatches
-TECH_DOCS += technical/bundle-format
 TECH_DOCS += technical/hash-function-transition
 TECH_DOCS += technical/http-protocol
 TECH_DOCS += technical/index-format
@@ -99,7 +90,6 @@ 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
@@ -140,7 +130,6 @@ 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
@@ -195,7 +184,6 @@ 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
@@ -226,7 +214,6 @@ endif
 
 ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
-	QUIET		= @
 	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;
 	QUIET_XMLTO	= @echo '   ' XMLTO $@;
 	QUIET_DB2TEXI	= @echo '   ' DB2TEXI $@;
@@ -234,15 +221,11 @@ ifndef V
 	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;
 	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
 	QUIET_GEN	= @echo '   ' GEN $@;
+	QUIET_LINT	= @echo '   ' LINT $@;
 	QUIET_STDERR	= 2> /dev/null
 	QUIET_SUBDIR0	= +@subdir=
 	QUIET_SUBDIR1	= ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
 			  $(MAKE) $(PRINT_DIR) -C $$subdir
-
-	QUIET_LINT_GITLINK	= @echo '   ' LINT GITLINK $<;
-	QUIET_LINT_MANSEC	= @echo '   ' LINT MAN SEC $<;
-	QUIET_LINT_MANEND	= @echo '   ' LINT MAN END $<;
-
 	export V
 endif
 endif
@@ -290,7 +273,7 @@ install-html: html
 ../GIT-VERSION-FILE: FORCE
 	$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
 
-ifneq ($(filter-out lint-docs clean,$(MAKECMDGOALS)),)
+ifneq ($(MAKECMDGOALS),clean)
 -include ../GIT-VERSION-FILE
 endif
 
@@ -301,8 +284,10 @@ docdep_prereqs = \
 	mergetools-list.made $(mergetools_txt) \
 	cmd-list.made $(cmds_txt)
 
-doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl
-	$(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@ $(QUIET_STDERR)
+doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt) build-docdep.perl
+	$(QUIET_GEN)$(RM) $@+ $@ && \
+	$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
+	mv $@+ $@
 
 ifneq ($(MAKECMDGOALS),clean)
 -include doc.dep
@@ -322,7 +307,8 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
 $(cmds_txt): cmd-list.made
 
 cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
-	$(QUIET_GEN)$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \
+	$(QUIET_GEN)$(RM) $@ && \
+	$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \
 	date >$@
 
 mergetools_txt = mergetools-diff.txt mergetools-merge.txt
@@ -330,7 +316,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) \
+	$(QUIET_GEN)$(RM) $@ && \
 	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
 		. ../git-mergetool--lib.sh && \
 		show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
@@ -349,7 +335,6 @@ GIT-ASCIIDOCFLAGS: FORCE
             fi
 
 clean:
-	$(RM) -rf .build/
 	$(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7
 	$(RM) *.texi *.texi+ *.texi++ git.info gitman.info
 	$(RM) *.pdf
@@ -360,23 +345,32 @@ clean:
 	$(RM) manpage-base-url.xsl
 	$(RM) GIT-ASCIIDOCFLAGS
 
-$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
-	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<
+$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
+	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+	$(TXT_TO_HTML) -d manpage -o $@+ $< && \
+	mv $@+ $@
 
-$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
-	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<
+$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
+	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+	$(TXT_TO_HTML) -o $@+ $< && \
+	mv $@+ $@
 
 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)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+	$(QUIET_XMLTO)$(RM) $@ && \
+	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 
-%.xml : %.txt $(ASCIIDOC_DEPS)
-	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
+%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
+	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+	$(TXT_TO_XML) -d manpage -o $@+ $< && \
+	mv $@+ $@
 
 user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
-	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $<
+	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+	$(TXT_TO_XML) -d book -o $@+ $< && \
+	mv $@+ $@
 
 technical/api-index.txt: technical/api-index-skel.txt \
 	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -397,35 +391,46 @@ XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css
 XSLTOPTS += --param generate.consistent.ids 1
 
 user-manual.html: user-manual.xml $(XSLT)
-	$(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
+	$(QUIET_XSLTPROC)$(RM) $@+ $@ && \
+	xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
+	mv $@+ $@
 
 git.info: user-manual.texi
 	$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
 
 user-manual.texi: user-manual.xml
-	$(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@+ && \
-	$(PERL_PATH) fix-texi.perl <$@+ >$@ && \
-	$(RM) $@+
+	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
+	$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
+	$(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
+	rm $@++ && \
+	mv $@+ $@
 
 user-manual.pdf: user-manual.xml
-	$(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $<
+	$(QUIET_DBLATEX)$(RM) $@+ $@ && \
+	$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
+	mv $@+ $@
 
 gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
-	$(QUIET_DB2TEXI) \
+	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
 	($(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) $@+
+		rm $(xml)+ &&) true) > $@++ && \
+	$(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \
+	rm $@++ && \
+	mv $@+ $@
 
 gitman.info: gitman.texi
 	$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
 
 $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
-	$(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@
+	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
+	$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
+	mv $@+ $@
 
-howto-index.txt: howto-index.sh $(HOWTO_TXT)
-	$(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@
+howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
+	$(QUIET_GEN)$(RM) $@+ $@ && \
+	'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \
+	mv $@+ $@
 
 $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
 	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
@@ -433,10 +438,11 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
 WEBDOC_DEST = /pub/software/scm/git/docs
 
 howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
-$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS
-	$(QUIET_ASCIIDOC) \
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt GIT-ASCIIDOCFLAGS
+	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
 	sed -e '1,/^$$/d' $< | \
-	$(TXT_TO_HTML) - >$@
+	$(TXT_TO_HTML) - >$@+ && \
+	mv $@+ $@
 
 install-webdoc : html
 	'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)
@@ -463,68 +469,12 @@ quick-install-html: require-htmlrepo
 print-man1:
 	@for i in $(MAN1_TXT); do echo $$i; done
 
-## Lint: Common
-.build:
-	$(QUIET)mkdir $@
-.build/lint-docs: | .build
-	$(QUIET)mkdir $@
-
-## Lint: gitlink
-.build/lint-docs/gitlink: | .build/lint-docs
-	$(QUIET)mkdir $@
-.build/lint-docs/gitlink/howto: | .build/lint-docs/gitlink
-	$(QUIET)mkdir $@
-.build/lint-docs/gitlink/config: | .build/lint-docs/gitlink
-	$(QUIET)mkdir $@
-LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
-$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink
-$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/howto
-$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/config
-$(LINT_DOCS_GITLINK): lint-gitlink.perl
-$(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt
-	$(QUIET_LINT_GITLINK)$(PERL_PATH) lint-gitlink.perl \
-		$< \
-		$(HOWTO_TXT) $(DOC_DEP_TXT) \
-		--section=1 $(MAN1_TXT) \
-		--section=5 $(MAN5_TXT) \
-		--section=7 $(MAN7_TXT) >$@
-.PHONY: lint-docs-gitlink
-lint-docs-gitlink: $(LINT_DOCS_GITLINK)
-
-## Lint: man-end-blurb
-.build/lint-docs/man-end-blurb: | .build/lint-docs
-	$(QUIET)mkdir $@
-LINT_DOCS_MAN_END_BLURB = $(patsubst %.txt,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT))
-$(LINT_DOCS_MAN_END_BLURB): | .build/lint-docs/man-end-blurb
-$(LINT_DOCS_MAN_END_BLURB): lint-man-end-blurb.perl
-$(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.txt
-	$(QUIET_LINT_MANEND)$(PERL_PATH) lint-man-end-blurb.perl $< >$@
-.PHONY: lint-docs-man-end-blurb
-lint-docs-man-end-blurb: $(LINT_DOCS_MAN_END_BLURB)
-
-## Lint: man-section-order
-.build/lint-docs/man-section-order: | .build/lint-docs
-	$(QUIET)mkdir $@
-LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.txt,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT))
-$(LINT_DOCS_MAN_SECTION_ORDER): | .build/lint-docs/man-section-order
-$(LINT_DOCS_MAN_SECTION_ORDER): lint-man-section-order.perl
-$(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt
-	$(QUIET_LINT_MANSEC)$(PERL_PATH) lint-man-section-order.perl $< >$@
-.PHONY: lint-docs-man-section-order
-lint-docs-man-section-order: $(LINT_DOCS_MAN_SECTION_ORDER)
-
-## Lint: list of targets above
-.PHONY: lint-docs
-lint-docs: lint-docs-gitlink
-lint-docs: lint-docs-man-end-blurb
-lint-docs: lint-docs-man-section-order
+lint-docs::
+	$(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl
 
 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

Documentation/MyFirstContribution.txt

@@ -47,7 +47,7 @@ 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
+==== https://webchat.freenode.net/#git-devel[#git-devel] on Freenode
 
 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
@@ -827,7 +827,7 @@ 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
+https://webchat.freenode.net/#git-devel[#git-devel] IRC channel on Freenode
 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
@@ -905,34 +905,19 @@ Sending emails with Git is a two-part process; before you can prepare the emails
 themselves, you'll need to prepare the patches. Luckily, this is pretty simple:
 
 ----
-$ git format-patch --cover-letter -o psuh/ --base=auto psuh@{u}..psuh
+$ git format-patch --cover-letter -o psuh/ master..psuh
 ----
 
- . The `--cover-letter` option tells `format-patch` to create a
-   cover letter template for you. You will need to fill in the
-   template before you're ready to send - but for now, the template
-   will be next to your other patches.
+The `--cover-letter` parameter tells `format-patch` to create a cover letter
+template for you. You will need to fill in the template before you're ready
+to send - but for now, the template will be next to your other patches.
 
- . The `-o psuh/` option tells `format-patch` to place the patch
-   files into a directory. This is useful because `git send-email`
-   can take a directory and send out all the patches from there.
+The `-o psuh/` parameter tells `format-patch` to place the patch files into a
+directory. This is useful because `git send-email` can take a directory and
+send out all the patches from there.
 
- . The `--base=auto` option tells the command to record the "base
-   commit", on which the recipient is expected to apply the patch
-   series.  The `auto` value will cause `format-patch` to compute
-   the base commit automatically, which is the merge base of tip
-   commit of the remote-tracking branch and the specified revision
-   range.
-
- . The `psuh@{u}..psuh` option tells `format-patch` to generate
-   patches for the commits you created on the `psuh` branch since it
-   forked from its upstream (which is `origin/master` if you
-   followed the example in the "Set up your workspace" section).  If
-   you are already on the `psuh` branch, you can just say `@{u}`,
-   which means "commits on the current branch since it forked from
-   its upstream", which is the same thing.
-
-The command will make one patch file per commit. After you
+`master..psuh` tells `format-patch` to generate patches for the difference
+between `master` and `psuh`. It will make one patch file per commit. After you
 run, you can go have a look at each of the patches with your favorite text
 editor and make sure everything looks alright; however, it's not recommended to
 make code fixups via the patch file. It's a better idea to make the change the
@@ -1044,42 +1029,22 @@ kidding - be patient!)
 [[v2-git-send-email]]
 === Sending v2
 
-This section will focus on how to send a v2 of your patchset. To learn what
-should go into v2, skip ahead to <<reviewing,Responding to Reviews>> for
-information on how to handle comments from reviewers.
+Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
+handle comments from reviewers. Continue this section when your topic branch is
+shaped the way you want it to look for your patchset v2.
 
-We'll reuse our `psuh` topic branch for v2. Before we make any changes, we'll
-mark the tip of our v1 branch for easy reference:
+When you're ready with the next iteration of your patch, the process is fairly
+similar.
+
+First, generate your v2 patches again:
 
 ----
-$ git checkout psuh
-$ git branch psuh-v1
+$ git format-patch -v2 --cover-letter -o psuh/ master..psuh
 ----
 
-Refine your patch series by using `git rebase -i` to adjust commits based upon
-reviewer comments. Once the patch series is ready for submission, generate your
-patches again, but with some new flags:
-
-----
-$ git format-patch -v2 --cover-letter -o psuh/ --range-diff master..psuh-v1 master..
-----
-
-The `--range-diff master..psuh-v1` parameter tells `format-patch` to include a
-range-diff between `psuh-v1` and `psuh` in the cover letter (see
-linkgit:git-range-diff[1]). This helps tell reviewers about the differences
-between your v1 and v2 patches.
-
-The `-v2` parameter tells `format-patch` to output your patches
-as version "2". For instance, you may notice that your v2 patches are
-all named like `v2-000n-my-commit-subject.patch`. `-v2` will also format
-your patches by prefixing them with "[PATCH v2]" instead of "[PATCH]",
-and your range-diff will be prefaced with "Range-diff against v1".
-
-Afer you run this command, `format-patch` will output the patches to the `psuh/`
-directory, alongside the v1 patches. Using a single directory makes it easy to
-refer to the old v1 patches while proofreading the v2 patches, but you will need
-to be careful to send out only the v2 patches. We will use a pattern like
-"psuh/v2-*.patch" (not "psuh/*.patch", which would match v1 and v2 patches).
+This will add your v2 patches, all named like `v2-000n-my-commit-subject.patch`,
+to the `psuh/` directory. You may notice that they are sitting alongside the v1
+patches; that's fine, but be careful when you are ready to send them.
 
 Edit your cover letter again. Now is a good time to mention what's different
 between your last version and now, if it's something significant. You do not
@@ -1117,7 +1082,7 @@ to the command:
 ----
 $ git send-email --to=target@example.com
 		 --in-reply-to="<foo.12345.author@example.com>"
-		 psuh/v2-*.patch
+		 psuh/v2*
 ----
 
 [[single-patch]]

Documentation/MyFirstObjectWalk.txt

@@ -58,19 +58,14 @@ running, enable trace output by setting the environment variable `GIT_TRACE`.
 
 Add usage text and `-h` handling, like all subcommands should consistently do
 (our test suite will notice and complain if you fail to do so).
-We'll need to include the `parse-options.h` header.
 
 ----
-#include "parse-options.h"
-
-...
-
 int cmd_walken(int argc, const char **argv, const char *prefix)
 {
 	const char * const walken_usage[] = {
 		N_("git walken"),
 		NULL,
-	};
+	}
 	struct option options[] = {
 		OPT_END()
 	};
@@ -200,14 +195,9 @@ Similarly to the default values, we don't have anything to do here yet
 ourselves; however, we should call `git_default_config()` if we aren't calling
 any other existing config callbacks.
 
-Add a new function to `builtin/walken.c`.
-We'll also need to include the `config.h` header:
+Add a new function to `builtin/walken.c`:
 
 ----
-#include "config.h"
-
-...
-
 static int git_walken_config(const char *var, const char *value, void *cb)
 {
 	/*
@@ -239,14 +229,8 @@ typically done by calling `repo_init_revisions()` with the repository you intend
 to target, as well as the `prefix` argument of `cmd_walken` and your `rev_info`
 struct.
 
-Add the `struct rev_info` and the `repo_init_revisions()` call.
-We'll also need to include the `revision.h` header:
-
+Add the `struct rev_info` and the `repo_init_revisions()` call:
 ----
-#include "revision.h"
-
-...
-
 int cmd_walken(int argc, const char **argv, const char *prefix)
 {
 	/* This can go wherever you like in your declarations.*/
@@ -640,14 +624,9 @@ static void walken_object_walk(struct rev_info *rev)
 ----
 
 Let's start by calling just the unfiltered walk and reporting our counts.
-Complete your implementation of `walken_object_walk()`.
-We'll also need to include the `list-objects.h` header.
+Complete your implementation of `walken_object_walk()`:
 
 ----
-#include "list-objects.h"
-
-...
-
 	traverse_commit_list(rev, walken_show_commit, walken_show_object, NULL);
 
 	printf("commits %d\nblobs %d\ntags %d\ntrees %d\n", commit_count,
@@ -712,13 +691,13 @@ help understand. In our case, that means we omit trees and blobs not directly
 referenced by `HEAD` or `HEAD`'s history, because we begin the walk with only
 `HEAD` in the `pending` list.)
 
-First, we'll need to `#include "list-objects-filter-options.h"` and set up the
+First, we'll need to `#include "list-objects-filter-options.h`" and set up the
 `struct list_objects_filter_options` at the top of the function.
 
 ----
 static void walken_object_walk(struct rev_info *rev)
 {
-	struct list_objects_filter_options filter_options = { 0 };
+	struct list_objects_filter_options filter_options = {};
 
 	...
 ----
@@ -800,7 +779,7 @@ Count all the objects within and modify the print statement:
 	while ((oid = oidset_iter_next(&oit)))
 		omitted_count++;
 
-	printf("commits %d\nblobs %d\ntags %d\ntrees %d\nomitted %d\n",
+	printf("commits %d\nblobs %d\ntags %d\ntrees%d\nomitted %d\n",
 		commit_count, blob_count, tag_count, tree_count, omitted_count);
 ----
 

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
-  newline in the message body.
+  no newline in the message body.
 
 * "git remote" fixed to protect printf from user input.
 

Documentation/RelNotes/1.8.4.txt

@@ -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 -", which took
+   counted as "checkout", and affected later "git checkout -" to the
    the user to an unexpected place.
    (merge 3bed291 rr/rebase-checkout-reflog later to maint).
 

Documentation/RelNotes/2.29.0.txt

@@ -184,8 +184,8 @@ Performance, Internal Implementation, Development Support etc.
    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.
+ * An unused binary has been discarded, and and a bunch of commands
+   have been turned into 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"

Documentation/RelNotes/2.30.3.txt

@@ -0,0 +1,24 @@
+Git v2.30.2 Release Notes
+=========================
+
+This release addresses the security issue CVE-2022-24765.
+
+Fixes since v2.30.2
+-------------------
+
+ * Build fix on Windows.
+
+ * Fix `GIT_CEILING_DIRECTORIES` with Windows-style root directories.
+
+ * CVE-2022-24765:
+   On multi-user machines, Git users might find themselves
+   unexpectedly in a Git worktree, e.g. when another user created a
+   repository in `C:\.git`, in a mounted network drive or in a
+   scratch space. Merely having a Git-aware prompt that runs `git
+   status` (or `git diff`) and navigating to a directory which is
+   supposedly not a Git worktree, or opening such a directory in an
+   editor or IDE such as VS Code or Atom, will potentially run
+   commands defined by that other user.
+
+Credit for finding this vulnerability goes to 俞晨东; The fix was
+authored by Johannes Schindelin.

Documentation/RelNotes/2.30.4.txt

@@ -0,0 +1,21 @@
+Git v2.30.4 Release Notes
+=========================
+
+This release contains minor fix-ups for the changes that went into
+Git 2.30.3, which was made to address CVE-2022-24765.
+
+ * The code that was meant to parse the new `safe.directory`
+   configuration variable was not checking what configuration
+   variable was being fed to it, which has been corrected.
+
+ * '*' can be used as the value for the `safe.directory` variable to
+   signal that the user considers that any directory is safe.
+
+
+
+Derrick Stolee (2):
+      t0033: add tests for safe.directory
+      setup: opt-out of check with safe.directory=*
+
+Matheus Valadares (1):
+      setup: fix safe.directory key not being checked

Documentation/RelNotes/2.31.2.txt

@@ -0,0 +1,6 @@
+Git v2.31.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3 to address
+the security issue CVE-2022-24765; see the release notes for that
+version for details.

Documentation/RelNotes/2.31.3.txt

@@ -0,0 +1,4 @@
+Git Documentation/RelNotes/2.31.3.txt Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.31.3.

Documentation/RelNotes/2.32.0.txt

@@ -1,416 +0,0 @@
-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).

Documentation/RelNotes/2.33.0.txt

@@ -1,279 +0,0 @@
-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).

Documentation/RelNotes/2.33.1.txt

@@ -1,138 +0,0 @@
-Git 2.33.1 Release Notes
-========================
-
-This primarily is to backport various fixes accumulated during the
-development towards Git 2.34, the next feature release.
-
-
-Fixes since v2.33
------------------
-
- * The unicode character width table (used for output alignment) has
-   been updated.
-
- * Input validation of "git pack-objects --stdin-packs" has been
-   corrected.
-
- * Bugfix for common ancestor negotiation recently introduced in "git
-   push" codepath.
-
- * "git pull" had various corner cases that were not well thought out
-   around its --rebase backend, e.g. "git pull --ff-only" did not stop
-   but went ahead and rebased when the history on other side is not a
-   descendant of our history.  The series tries to fix them up.
-
- * "git apply" miscounted the bytes and failed to read to the end of
-   binary hunks.
-
- * "git range-diff" code clean-up.
-
- * "git commit --fixup" now works with "--edit" again, after it was
-   broken in v2.32.
-
- * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
-   new version has a blocker bug for that architecture.
-
- * Checking out all the paths from HEAD during the last conflicted
-   step in "git rebase" and continuing would cause the step to be
-   skipped (which is expected), but leaves MERGE_MSG file behind in
-   $GIT_DIR and confuses the next "git commit", which has been
-   corrected.
-
- * Various bugs in "git rebase -r" have been fixed.
-
- * mmap() imitation used to call xmalloc() that dies upon malloc()
-   failure, which has been corrected to just return an error to the
-   caller to be handled.
-
- * "git diff --relative" segfaulted and/or produced incorrect result
-   when there are unmerged paths.
-
- * The delayed checkout code path in "git checkout" etc. were chatty
-   even when --quiet and/or --no-progress options were given.
-
- * "git branch -D <branch>" used to refuse to remove a broken branch
-   ref that points at a missing commit, which has been corrected.
-
- * Build update for Apple clang.
-
- * The parser for the "--nl" option of "git column" has been
-   corrected.
-
- * "git upload-pack" which runs on the other side of "git fetch"
-   forgot to take the ref namespaces into account when handling
-   want-ref requests.
-
- * The sparse-index support can corrupt the index structure by storing
-   a stale and/or uninitialized data, which has been corrected.
-
- * Buggy tests could damage repositories outside the throw-away test
-   area we created.  We now by default export GIT_CEILING_DIRECTORIES
-   to limit the damage from such a stray test.
-
- * Even when running "git send-email" without its own threaded
-   discussion support, a threading related header in one message is
-   carried over to the subsequent message to result in an unwanted
-   threading, which has been corrected.
-
- * The output from "git fast-export", when its anonymization feature
-   is in use, showed an annotated tag incorrectly.
-
- * Recent "diff -m" changes broke "gitk", which has been corrected.
-
- * "git maintenance" scheduler fix for macOS.
-
- * A pathname in an advice message has been made cut-and-paste ready.
-
- * The "git apply -3" code path learned not to bother the lower level
-   merge machinery when the three-way merge can be trivially resolved
-   without the content level merge.
-
- * The code that optionally creates the *.rev reverse index file has
-   been optimized to avoid needless computation when it is not writing
-   the file out.
-
- * "git range-diff -I... <range> <range>" segfaulted, which has been
-   corrected.
-
- * The order in which various files that make up a single (conceptual)
-   packfile has been reevaluated and straightened up.  This matters in
-   correctness, as an incomplete set of files must not be shown to a
-   running Git.
-
- * The "mode" word is useless in a call to open(2) that does not
-   create a new file.  Such a call in the files backend of the ref
-   subsystem has been cleaned up.
-
- * "git update-ref --stdin" failed to flush its output as needed,
-   which potentially led the conversation to a deadlock.
-
- * When "git am --abort" fails to abort correctly, it still exited
-   with exit status of 0, which has been corrected.
-
- * Correct nr and alloc members of strvec struct to be of type size_t.
-
- * "git stash", where the tentative change involves changing a
-   directory to a file (or vice versa), was confused, which has been
-   corrected.
-
- * "git clone" from a repository whose HEAD is unborn into a bare
-   repository didn't follow the branch name the other side used, which
-   is corrected.
-
- * "git cvsserver" had a long-standing bug in its authentication code,
-   which has finally been corrected (it is unclear and is a separate
-   question if anybody is seriously using it, though).
-
- * "git difftool --dir-diff" mishandled symbolic links.
-
- * Sensitive data in the HTTP trace were supposed to be redacted, but
-   we failed to do so in HTTP/2 requests.
-
- * "make clean" has been updated to remove leftover .depend/
-   directories, even when it is not told to use them to compute header
-   dependencies.
-
- * Protocol v0 clients can get stuck parsing a malformed feature line.
-
-Also contains various documentation updates and code clean-ups.

Documentation/RelNotes/2.34.0.txt

@@ -1,438 +0,0 @@
-Git 2.34 Release Notes
-======================
-
-Updates since Git 2.33
-----------------------
-
-Backward compatibility notes
-
- * The "--preserve-merges" option of "git rebase" has been removed.
-
-
-UI, Workflows & Features
-
- * Pathname expansion (like "~username/") learned a way to specify a
-   location relative to Git installation (e.g. its $sharedir which is
-   $(prefix)/share), with "%(prefix)".
-
- * The `ort` strategy is used instead of `recursive` as the default
-   merge strategy.
-
- * The userdiff pattern for "java" language has been updated.
-
- * "git rebase" by default skips changes that are equivalent to
-   commits that are already in the history the branch is rebased onto;
-   give messages when this happens to let the users be aware of
-   skipped commits, and also teach them how to tell "rebase" to keep
-   duplicated changes.
-
- * The advice message that "git cherry-pick" gives when it asks
-   conflicted replay of a commit to be resolved by the end user has
-   been updated.
-
- * After "git clone --recurse-submodules", all submodules are cloned
-   but they are not by default recursed into by other commands.  With
-   submodule.stickyRecursiveClone configuration set, submodule.recurse
-   configuration is set to true in a repository created by "clone"
-   with "--recurse-submodules" option.
-
- * The logic for auto-correction of misspelt subcommands learned to go
-   interactive when the help.autocorrect configuration variable is set
-   to 'prompt'.
-
- * "git maintenance" scheduler learned to use systemd timers as a
-   possible backend.
-
- * "git diff --submodule=diff" showed failure from run_command() when
-   trying to run diff inside a submodule, when the user manually
-   removes the submodule directory.
-
- * "git bundle unbundle" learned to show progress display.
-
- * In cone mode, the sparse-index code path learned to remove ignored
-   files (like build artifacts) outside the sparse cone, allowing the
-   entire directory outside the sparse cone to be removed, which is
-   especially useful when the sparse patterns change.
-
- * Taking advantage of the CGI interface, http-backend has been
-   updated to enable protocol v2 automatically when the other side
-   asks for it.
-
- * The credential-cache helper has been adjusted to Windows.
-
- * The error in "git help no-such-git-command" is handled better.
-
- * The unicode character width table (used for output alignment) has
-   been updated.
-
- * The ref iteration code used to optionally allow dangling refs to be
-   shown, which has been tightened up.
-
- * "git add", "git mv", and "git rm" have been adjusted to avoid
-   updating paths outside of the sparse-checkout definition unless
-   the user specifies a "--sparse" option.
-
- * "git repack" has been taught to generate multi-pack reachability
-   bitmaps.
-
- * "git fsck" has been taught to report mismatch between expected and
-   actual types of an object better.
-
- * In addition to GnuPG, ssh public crypto can be used for object and
-   push-cert signing.  Note that this feature cannot be used with
-   ssh-keygen from OpenSSH 8.7, whose support for it is broken.  Avoid
-   using it unless you update to OpenSSH 8.8.
-
- * "git log --grep=string --author=name" learns to highlight hits just
-   like "git grep string" does.
-
-
-
-Performance, Internal Implementation, Development Support etc.
-
- * "git bisect" spawned "git show-branch" only to pretty-print the
-   title of the commit after checking out the next version to be
-   tested; this has been rewritten in C.
-
- * "git add" can work better with the sparse index.
-
- * Support for ancient versions of cURL library (pre 7.19.4) has been
-   dropped.
-
- * A handful of tests that assumed implementation details of files
-   backend for refs have been cleaned up.
-
- * trace2 logs learned to show parent process name to see in what
-   context Git was invoked.
-
- * Loading of ref tips to prepare for common ancestry negotiation in
-   "git fetch-pack" has been optimized by taking advantage of the
-   commit graph when available.
-
- * Remind developers that the userdiff patterns should be kept simple
-   and permissive, assuming that the contents they apply are always
-   syntactically correct.
-
- * The current implementation of GIT_TEST_FAIL_PREREQS is broken in
-   that checking for the lack of a prerequisite would not work.  Avoid
-   the use of "if ! test_have_prereq X" in a test script.
-
- * The revision traversal API has been optimized by taking advantage
-   of the commit-graph, when available, to determine if a commit is
-   reachable from any of the existing refs.
-
- * "git fetch --quiet" optimization to avoid useless computation of
-   info that will never be displayed.
-
- * Callers from older advice_config[] based API has been updated to
-   use the newer advice_if_enabled() and advice_enabled() API.
-
- * Teach "test_pause" and "debug" helpers to allow using the HOME and
-   TERM environment variables the user usually uses.
-
- * "make INSTALL_STRIP=-s install" allows the installation step to use
-   "install -s" to strip the binaries as they get installed.
-
- * Code that handles large number of refs in the "git fetch" code
-   path has been optimized.
-
- * The reachability bitmap file used to be generated only for a single
-   pack, but now we've learned to generate bitmaps for history that
-   span across multiple packfiles.
-
- * The code to make "git grep" recurse into submodules has been
-   updated to migrate away from the "add submodule's object store as
-   an alternate object store" mechanism (which is suboptimal).
-
- * The tracing of process ancestry information has been enhanced.
-
- * Reduce number of write(2) system calls while sending the
-   ref advertisement.
-
- * Update the build procedure to use the "-pedantic" build when
-   DEVELOPER makefile macro is in effect.
-
- * Large part of "git submodule add" gets rewritten in C.
-
- * The run-command API has been updated so that the callers can easily
-   ask the file descriptors open for packfiles to be closed immediately
-   before spawning commands that may trigger auto-gc.
-
- * An oddball OPTION_ARGUMENT feature has been removed from the
-   parse-options API.
-
- * The mergesort implementation used to sort linked list has been
-   optimized.
-
- * Remove external declaration of functions that no longer exist.
-
- * "git multi-pack-index write --bitmap" learns to propagate the
-   hashcache from original bitmap to resulting bitmap.
-
- * CI learns to run the leak sanitizer builds.
-
- * "git grep --recurse-submodules" takes trees and blobs from the
-   submodule repository, but the textconv settings when processing a
-   blob from the submodule is not taken from the submodule repository.
-   A test is added to demonstrate the issue, without fixing it.
-
- * Teach "git help -c" into helping the command line completion of
-   configuration variables.
-
- * When "git cmd -h" shows more than one line of usage text (e.g.
-   the cmd subcommand may take sub-sub-command), parse-options API
-   learned to align these lines, even across i18n/l10n.
-
- * Prevent "make sparse" from running for the source files that
-   haven't been modified.
-
- * The code path to write a new version of .midx multi-pack index files
-   has learned to release the mmaped memory holding the current
-   version of .midx before removing them from the disk, as some
-   platforms do not allow removal of a file that still has mapping.
-
- * A new feature has been added to abort early in the test framework.
-
-
-Fixes since v2.33
------------------
-
- * Input validation of "git pack-objects --stdin-packs" has been
-   corrected.
-
- * Bugfix for common ancestor negotiation recently introduced in "git
-   push" code path.
-
- * "git pull" had various corner cases that were not well thought out
-   around its --rebase backend, e.g. "git pull --ff-only" did not stop
-   but went ahead and rebased when the history on other side is not a
-   descendant of our history.  The series tries to fix them up.
-
- * "git apply" miscounted the bytes and failed to read to the end of
-   binary hunks.
-
- * "git range-diff" code clean-up.
-
- * "git commit --fixup" now works with "--edit" again, after it was
-   broken in v2.32.
-
- * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
-   new version has a blocker bug for that architecture.
-
- * Checking out all the paths from HEAD during the last conflicted
-   step in "git rebase" and continuing would cause the step to be
-   skipped (which is expected), but leaves MERGE_MSG file behind in
-   $GIT_DIR and confuses the next "git commit", which has been
-   corrected.
-
- * Various bugs in "git rebase -r" have been fixed.
-
- * mmap() imitation used to call xmalloc() that dies upon malloc()
-   failure, which has been corrected to just return an error to the
-   caller to be handled.
-
- * "git diff --relative" segfaulted and/or produced incorrect result
-   when there are unmerged paths.
-
- * The delayed checkout code path in "git checkout" etc. were chatty
-   even when --quiet and/or --no-progress options were given.
-
- * "git branch -D <branch>" used to refuse to remove a broken branch
-   ref that points at a missing commit, which has been corrected.
-
- * Build update for Apple clang.
-
- * The parser for the "--nl" option of "git column" has been
-   corrected.
-
- * "git upload-pack" which runs on the other side of "git fetch"
-   forgot to take the ref namespaces into account when handling
-   want-ref requests.
-
- * The sparse-index support can corrupt the index structure by storing
-   a stale and/or uninitialized data, which has been corrected.
-
- * Buggy tests could damage repositories outside the throw-away test
-   area we created.  We now by default export GIT_CEILING_DIRECTORIES
-   to limit the damage from such a stray test.
-
- * Even when running "git send-email" without its own threaded
-   discussion support, a threading related header in one message is
-   carried over to the subsequent message to result in an unwanted
-   threading, which has been corrected.
-
- * The output from "git fast-export", when its anonymization feature
-   is in use, showed an annotated tag incorrectly.
-
- * Recent "diff -m" changes broke "gitk", which has been corrected.
-
- * The "git apply -3" code path learned not to bother the lower level
-   merge machinery when the three-way merge can be trivially resolved
-   without the content level merge.  This fixes a regression caused by
-   recent "-3way first and fall back to direct application" change.
-
- * The code that optionally creates the *.rev reverse index file has
-   been optimized to avoid needless computation when it is not writing
-   the file out.
-
- * "git range-diff -I... <range> <range>" segfaulted, which has been
-   corrected.
-
- * The order in which various files that make up a single (conceptual)
-   packfile has been reevaluated and straightened up.  This matters in
-   correctness, as an incomplete set of files must not be shown to a
-   running Git.
-
- * The "mode" word is useless in a call to open(2) that does not
-   create a new file.  Such a call in the files backend of the ref
-   subsystem has been cleaned up.
-
- * "git update-ref --stdin" failed to flush its output as needed,
-   which potentially led the conversation to a deadlock.
-
- * When "git am --abort" fails to abort correctly, it still exited
-   with exit status of 0, which has been corrected.
-
- * Correct nr and alloc members of strvec struct to be of type size_t.
-
- * "git stash", where the tentative change involves changing a
-   directory to a file (or vice versa), was confused, which has been
-   corrected.
-
- * "git clone" from a repository whose HEAD is unborn into a bare
-   repository didn't follow the branch name the other side used, which
-   is corrected.
-
- * "git cvsserver" had a long-standing bug in its authentication code,
-   which has finally been corrected (it is unclear and is a separate
-   question if anybody is seriously using it, though).
-
- * "git difftool --dir-diff" mishandled symbolic links.
-
- * Sensitive data in the HTTP trace were supposed to be redacted, but
-   we failed to do so in HTTP/2 requests.
-
- * "make clean" has been updated to remove leftover .depend/
-   directories, even when it is not told to use them to compute header
-   dependencies.
-
- * Protocol v0 clients can get stuck parsing a malformed feature line.
-
- * A few kinds of changes "git status" can show were not documented.
-   (merge d2a534c515 ja/doc-status-types-and-copies later to maint).
-
- * The mergesort implementation used to sort linked list has been
-   optimized.
-   (merge c90cfc225b rs/mergesort later to maint).
-
- * An editor session launched during a Git operation (e.g. during 'git
-   commit') can leave the terminal in a funny state.  The code path
-   has updated to save the terminal state before, and restore it
-   after, it spawns an editor.
-   (merge 3d411afabc cm/save-restore-terminal later to maint).
-
- * "git cat-file --batch" with the "--batch-all-objects" option is
-   supposed to iterate over all the objects found in a repository, but
-   it used to translate these object names using the replace mechanism,
-   which defeats the point of enumerating all objects in the repository.
-   This has been corrected.
-   (merge bf972896d7 jk/cat-file-batch-all-wo-replace later to maint).
-
- * Recent sparse-index work broke safety against attempts to add paths
-   with trailing slashes to the index, which has been corrected.
-   (merge c8ad9d04c6 rs/make-verify-path-really-verify-again later to maint).
-
- * The "--color-lines" and "--color-by-age" options of "git blame"
-   have been missing, which are now documented.
-   (merge 8c32856133 bs/doc-blame-color-lines later to maint).
-
- * The PATH used in CI job may be too wide and let incompatible dlls
-   to be grabbed, which can cause the build&test to fail.  Tighten it.
-   (merge 7491ef6198 js/windows-ci-path-fix later to maint).
-
- * Avoid performance measurements from getting ruined by gc and other
-   housekeeping pauses interfering in the middle.
-   (merge be79131a53 rs/disable-gc-during-perf-tests later to maint).
-
- * Stop "git add --dry-run" from creating new blob and tree objects.
-   (merge e578d0311d rs/add-dry-run-without-objects later to maint).
-
- * "git commit" gave duplicated error message when the object store
-   was unwritable, which has been corrected.
-   (merge 4ef91a2d79 ab/fix-commit-error-message-upon-unwritable-object-store later to maint).
-
- * Recent sparse-index addition, namely any use of index_name_pos(),
-   can expand sparse index entries and breaks any code that walks
-   cache-tree or existing index entries.  One such instance of such a
-   breakage has been corrected.
-
- * The xxdiff difftool backend can exit with status 128, which the
-   difftool-helper that launches the backend takes as a significant
-   failure, when it is not significant at all.  Work it around.
-   (merge 571f4348dd da/mergetools-special-case-xxdiff-exit-128 later to maint).
-
- * Improve test framework around unwritable directories.
-   (merge 5d22e18965 ab/test-cleanly-recreate-trash-directory later to maint).
-
- * "git push" client talking to an HTTP server did not diagnose the
-   lack of the final status report from the other side correctly,
-   which has been corrected.
-   (merge c5c3486f38 jk/http-push-status-fix later to maint).
-
- * Update "git archive" documentation and give explicit mention on the
-   compression level for both zip and tar.gz format.
-   (merge c4b208c309 bs/archive-doc-compression-level later to maint).
-
- * Drop "git sparse-checkout" from the list of common commands.
-   (merge 6a9a50a8af sg/sparse-index-not-that-common-a-command later to maint).
-
- * "git branch -c/-m new old" was not described to copy config, which
-   has been corrected.
-   (merge 8252ec300e jc/branch-copy-doc later to maint).
-
- * Squelch over-eager warning message added during this cycle.
-
- * Fix long-standing shell syntax error in the completion script.
-   (merge 46b0585286 re/completion-fix-test-equality later to maint).
-
- * Teach "git commit-graph" command not to allow using replace objects
-   at all, as we do not use the commit-graph at runtime when we see
-   object replacement.
-   (merge 095d112f8c ab/ignore-replace-while-working-on-commit-graph later to maint).
-
- * "git pull --no-verify" did not affect the underlying "git merge".
-   (merge 47bfdfb3fd ar/fix-git-pull-no-verify later to maint).
-
- * One CI task based on Fedora image noticed a not-quite-kosher
-   construct recently, which has been corrected.
-
- * "git pull --ff-only" and "git pull --rebase --ff-only" should make
-   it a no-op to attempt pulling from a remote that is behind us, but
-   instead the command errored out by saying it was impossible to
-   fast-forward, which may technically be true, but not a useful thing
-   to diagnose as an error.  This has been corrected.
-   (merge 361cb52383 jc/fix-pull-ff-only-when-already-up-to-date later to maint).
-
- * The way Cygwin emulates a unix-domain socket, on top of which the
-   simple-ipc mechanism is implemented, can race with the program on
-   the other side that wants to use the socket, and briefly make it
-   appear as a regular file before lstat(2) starts reporting it as a
-   socket.  We now have a workaround on the side that connects to a
-   unix domain socket.
-
- * Other code cleanup, docfix, build fix, etc.
-   (merge f188160be9 ab/bundle-remove-verbose-option later to maint).
-   (merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
-   (merge 51b04c05b7 bs/difftool-msg-tweak later to maint).
-   (merge dd20e4a6db ab/make-compdb-fix later to maint).
-   (merge 6ffb990dc4 os/status-docfix later to maint).
-   (merge 100c2da2d3 rs/p3400-lose-tac later to maint).
-   (merge 76f3b69896 tb/aggregate-ignore-leading-whitespaces later to maint).
-   (merge 6e4fd8bfcd tz/doc-link-to-bundle-format-fix later to maint).
-   (merge f6c013dfa1 jc/doc-commit-header-continuation-line later to maint).
-   (merge ec9a37d69b ab/pkt-line-cleanup later to maint).
-   (merge 8650c6298c ab/fix-make-lint-docs later to maint).
-   (merge 1c720357ce ab/test-lib-diff-cleanup later to maint).
-   (merge 6b615dbece ks/submodule-add-message-fix later to maint).
-   (merge 203eb8381a jc/doc-format-patch-clarify-auto-base later to maint).
-   (merge 559664c792 ab/test-lib later to maint).

Documentation/RelNotes/2.34.1.txt

@@ -1,23 +0,0 @@
-Git v2.34.1 Release Notes
-=========================
-
-This release is primarily to fix a handful of regressions in Git 2.34.
-
-Fixes since v2.34
------------------
-
- * "git grep" looking in a blob that has non-UTF8 payload was
-   completely broken when linked with certain versions of PCREv2
-   library in the latest release.
-
- * "git pull" with any strategy when the other side is behind us
-   should succeed as it is a no-op, but doesn't.
-
- * An earlier change in 2.34.0 caused JGit application (that abused
-   GIT_EDITOR mechanism when invoking "git config") to get stuck with
-   a SIGTTOU signal; it has been reverted.
-
- * An earlier change that broke .gitignore matching has been reverted.
-
- * SubmittingPatches document gained a syntactically incorrect mark-up,
-   which has been corrected.

Documentation/RelNotes/2.35.0.txt

@@ -1,393 +0,0 @@
-Git 2.35 Release Notes
-======================
-
-Updates since Git 2.34
-----------------------
-
-Backward compatibility warts
-
- * "_" is now treated as any other URL-valid characters in an URL when
-   matching the per-URL configuration variable names.
-
- * The color palette used by "git grep" has been updated to match that
-   of GNU grep.
-
-
-UI, Workflows & Features
-
- * "git status --porcelain=v2" now show the number of stash entries
-   with --show-stash like the normal output does.
-
- * "git stash" learned the "--staged" option to stash away what has
-   been added to the index (and nothing else).
-
- * "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
-   the newly created branch if "git init" is run.
-
- * Various operating modes of "git reset" have been made to work
-   better with the sparse index.
-
- * "git submodule deinit" for a submodule whose .git metadata
-   directory is embedded in its working tree refused to work, until
-   the submodule gets converted to use the "absorbed" form where the
-   metadata directory is stored in superproject, and a gitfile at the
-   top-level of the working tree of the submodule points at it.  The
-   command is taught to convert such submodules to the absorbed form
-   as needed.
-
- * The completion script (in contrib/) learns that the "--date"
-   option of commands from the "git log" family takes "human" and
-   "auto" as valid values.
-
- * "Zealous diff3" style of merge conflict presentation has been added.
-
- * The "git log --format=%(describe)" placeholder has been extended to
-   allow passing selected command-line options to the underlying "git
-   describe" command.
-
- * "default" and "reset" have been added to our color palette.
-
- * The cryptographic signing using ssh keys can specify literal keys
-   for keytypes whose name do not begin with the "ssh-" prefix by
-   using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").
-
- * "git fetch" without the "--update-head-ok" option ought to protect
-   a checked out branch from getting updated, to prevent the working
-   tree that checks it out to go out of sync.  The code was written
-   before the use of "git worktree" got widespread, and only checked
-   the branch that was checked out in the current worktree, which has
-   been updated.
-
- * "git name-rev" has been tweaked to give output that is shorter and
-   easier to understand.
-
- * "git apply" has been taught to ignore a message without a patch
-   with the "--allow-empty" option.  It also learned to honor the
-   "--quiet" option given from the command line.
-
- * The "init" and "set" subcommands in "git sparse-checkout" have been
-   unified for a better user experience and performance.
-
- * Many git commands that deal with working tree files try to remove a
-   directory that becomes empty (i.e. "git switch" from a branch that
-   has the directory to another branch that does not would attempt
-   remove all files in the directory and the directory itself).  This
-   drops users into an unfamiliar situation if the command was run in
-   a subdirectory that becomes subject to removal due to the command.
-   The commands have been taught to keep an empty directory if it is
-   the directory they were started in to avoid surprising users.
-
- * "git am" learns "--empty=(stop|drop|keep)" option to tweak what is
-   done to a piece of e-mail without a patch in it.
-
- * The default merge message prepared by "git merge" records the name
-   of the current branch; the name can be overridden with a new option
-   to allow users to pretend a merge is made on a different branch.
-
- * The way "git p4" shows file sizes in its output has been updated to
-   use human-readable units.
-
- * "git -c branch.autosetupmerge=inherit branch new old" makes "new"
-   to have the same upstream as the "old" branch, instead of marking
-   "old" itself as its upstream.
-
-
-Performance, Internal Implementation, Development Support etc.
-
- * The use of errno as a means to carry the nature of error in the ref
-   API implementation has been reworked and reduced.
-
- * Teach and encourage first-time contributors to this project to
-   state the base commit when they submit their topic.
-
- * The command line complation for "git send-email" options have been
-   tweaked to make it easier to keep it in sync with the command itself.
-
- * Ensure that the sparseness of the in-core index matches the
-   index.sparse configuration specified by the repository immediately
-   after the on-disk index file is read.
-
- * Code clean-up to eventually allow information on remotes defined
-   for an arbitrary repository to be read.
-
- * Build optimization.
-
- * Tighten code for testing pack-bitmap.
-
- * Weather balloon to break people with compilers that do not support
-   C99.
-
- * The "reftable" backend for the refs API, without integrating into
-   the refs subsystem, has been added.
-
- * More tests are marked as leak-free.
-
- * The test framework learns to list unsatisfied test prerequisites,
-   and optionally error out when prerequisites that are expected to be
-   satisfied are not.
-
- * The default setting for trace2 event nesting was too low to cause
-   test failures, which is worked around by bumping it up in the test
-   framework.
-
- * Drop support for TravisCI and update test workflows at GitHub.
-
- * Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-   mechanism to force "git" to use 'master' as the default name for
-   the initial branch no longer need it; the use of the mechanism from
-   them have been removed.
-
- * Allow running our tests while disabling fsync.
-
- * Document the parameters given to the reflog entry iterator callback
-   functions.
-   (merge e6e94f34b2 jc/reflog-iterator-callback-doc later to maint).
-
- * The test helper for refs subsystem learned to write bogus and/or
-   nonexistent object name to refs to simulate error situations we
-   want to test Git in.
-
- * "diff --histogram" optimization.
-
- * Weather balloon to find compilers that do not grok variable
-   declaration in the for() loop.
-
- * diff and blame commands have been taught to work better with sparse
-   index.
-
- * The chainlint test script linter in the test suite has been updated.
-
- * The DEVELOPER=yes build uses -std=gnu99 now.
-
- * "git format-patch" uses a single rev_info instance and then exits.
-   Mark the structure with UNLEAK() macro to squelch leak sanitizer.
-
- * New interface into the tmp-objdir API to help in-core use of the
-   quarantine feature.
-
- * Broken &&-chains in the test scripts have been corrected.
-
- * The RCS keyword substitution in "git p4" used to be done assuming
-   that the contents are UTF-8 text, which can trigger decoding
-   errors.  We now treat the contents as a bytestring for robustness
-   and correctness.
-
- * The conditions to choose different definitions of the FLEX_ARRAY
-   macro for vendor compilers has been simplified to make it easier to
-   maintain.
-
- * Correctness and performance update to "diff --color-moved" feature.
-
- * "git upload-pack" (the other side of "git fetch") used a 8kB buffer
-   but most of its payload came on 64kB "packets".  The buffer size
-   has been enlarged so that such a packet fits.
-
- * "git fetch" and "git pull" are now declared sparse-index clean.
-   Also "git ls-files" learns the "--sparse" option to help debugging.
-
- * Similar message templates have been consolidated so that
-   translators need to work on fewer number of messages.
-
-
-Fixes since v2.34
------------------
-
- * "git grep" looking in a blob that has non-UTF8 payload was
-   completely broken when linked with certain versions of PCREv2
-   library in the latest release.
-
- * Other code cleanup, docfix, build fix, etc.
-
- * "git pull" with any strategy when the other side is behind us
-   should succeed as it is a no-op, but doesn't.
-
- * An earlier change in 2.34.0 caused JGit application (that abused
-   GIT_EDITOR mechanism when invoking "git config") to get stuck with
-   a SIGTTOU signal; it has been reverted.
-
- * An earlier change that broke .gitignore matching has been reverted.
-
- * Things like "git -c branch.sort=bogus branch new HEAD", i.e. the
-   operation modes of the "git branch" command that do not need the
-   sort key information, no longer errors out by seeing a bogus sort
-   key.
-   (merge 98e7ab6d42 jc/fix-ref-sorting-parse later to maint).
-
- * The compatibility implementation for unsetenv(3) were written to
-   mimic ancient, non-POSIX, variant seen in an old glibc; it has been
-   changed to return an integer to match the more modern era.
-   (merge a38989bd5b jc/unsetenv-returns-an-int later to maint).
-
- * The clean/smudge conversion code path has been prepared to better
-   work on platforms where ulong is narrower than size_t.
-   (merge 596b5e77c9 mc/clean-smudge-with-llp64 later to maint).
-
- * Redact the path part of packfile URI that appears in the trace output.
-   (merge 0ba558ffb1 if/redact-packfile-uri later to maint).
-
- * CI has been taught to catch some Unicode directional formatting
-   sequence that can be used in certain mischief.
-   (merge 0e7696c64d js/ci-no-directional-formatting later to maint).
-
- * The "--date=format:<strftime>" gained a workaround for the lack of
-   system support for a non-local timezone to handle "%s" placeholder.
-   (merge 9b591b9403 jk/strbuf-addftime-seconds-since-epoch later to maint).
-
- * The "merge" subcommand of "git jump" (in contrib/) silently ignored
-   pathspec and other parameters.
-   (merge 67ba13e5a4 jk/jump-merge-with-pathspec later to maint).
-
- * The code to decode the length of packed object size has been
-   corrected.
-   (merge 34de5b8eac jt/pack-header-lshift-overflow later to maint).
-
- * The advice message given by "git pull" when the user hasn't made a
-   choice between merge and rebase still said that the merge is the
-   default, which no longer is the case.  This has been corrected.
-   (merge 71076d0edd ah/advice-pull-has-no-preference-between-rebase-and-merge later to maint).
-
- * "git fetch", when received a bad packfile, can fail with SIGPIPE.
-   This wasn't wrong per-se, but we now detect the situation and fail
-   in a more predictable way.
-   (merge 2a4aed42ec jk/fetch-pack-avoid-sigpipe-to-index-pack later to maint).
-
- * The function to cull a child process and determine the exit status
-   had two separate code paths for normal callers and callers in a
-   signal handler, and the latter did not yield correct value when the
-   child has caught a signal.  The handling of the exit status has
-   been unified for these two code paths.  An existing test with
-   flakiness has also been corrected.
-   (merge 5263e22cba jk/t7006-sigpipe-tests-fix later to maint).
-
- * When a non-existent program is given as the pager, we tried to
-   reuse an uninitialized child_process structure and crashed, which
-   has been fixed.
-   (merge f917f57f40 em/missing-pager later to maint).
-
- * The single-key-input mode in "git add -p" had some code to handle
-   keys that generate a sequence of input via ReadKey(), which did not
-   handle end-of-file correctly, which has been fixed.
-   (merge fc8a8126df cb/add-p-single-key-fix later to maint).
-
- * "git rebase -x" added an unnecessary 'exec' instructions before
-   'noop', which has been corrected.
-   (merge cc9dcdee61 en/rebase-x-fix later to maint).
-
- * When the "git push" command is killed while the receiving end is
-   trying to report what happened to the ref update proposals, the
-   latter used to die, due to SIGPIPE.  The code now ignores SIGPIPE
-   to increase our chances to run the post-receive hook after it
-   happens.
-   (merge d34182b9e3 rj/receive-pack-avoid-sigpipe-during-status-reporting later to maint).
-
- * "git worktree add" showed "Preparing worktree" message to the
-   standard output stream, but when it failed, the message from die()
-   went to the standard error stream.  Depending on the order the
-   stdio streams are flushed at the program end, this resulted in
-   confusing output.  It has been corrected by sending all the chatty
-   messages to the standard error stream.
-   (merge b50252484f es/worktree-chatty-to-stderr later to maint).
-
- * Coding guideline document has been updated to clarify what goes to
-   standard error in our system.
-   (merge e258eb4800 es/doc-stdout-vs-stderr later to maint).
-
- * The sparse-index/sparse-checkout feature had a bug in its use of
-   the matching code to determine which path is in or outside the
-   sparse checkout patterns.
-   (merge 8c5de0d265 ds/sparse-deep-pattern-checkout-fix later to maint).
-
- * "git rebase -x" by mistake started exporting the GIT_DIR and
-   GIT_WORK_TREE environment variables when the command was rewritten
-   in C, which has been corrected.
-   (merge 434e0636db en/rebase-x-wo-git-dir-env later to maint).
-
- * When "git log" implicitly enabled the "decoration" processing
-   without being explicitly asked with "--decorate" option, it failed
-   to read and honor the settings given by the "--decorate-refs"
-   option.
-
- * "git fetch --set-upstream" did not check if there is a current
-   branch, leading to a segfault when it is run on a detached HEAD,
-   which has been corrected.
-   (merge 17baeaf82d ab/fetch-set-upstream-while-detached later to maint).
-
- * Among some code paths that ask an yes/no question, only one place
-   gave a prompt that looked different from the others, which has been
-   updated to match what the others create.
-   (merge 0fc8ed154c km/help-prompt-fix later to maint).
-
- * "git log --invert-grep --author=<name>" used to exclude commits
-   written by the given author, but now "--invert-grep" only affects
-   the matches made by the "--grep=<pattern>" option.
-   (merge 794c000267 rs/log-invert-grep-with-headers later to maint).
-
- * "git grep --perl-regexp" failed to match UTF-8 characters with
-   wildcard when the pattern consists only of ASCII letters, which has
-   been corrected.
-   (merge 32e3e8bc55 rs/pcre2-utf later to maint).
-
- * Certain sparse-checkout patterns that are valid in non-cone mode
-   led to segfault in cone mode, which has been corrected.
-
- * Use of certain "git rev-list" options with "git fast-export"
-   created nonsense results (the worst two of which being "--reverse"
-   and "--invert-grep --grep=<foo>").  The use of "--first-parent" is
-   made to behave a bit more sensible than before.
-   (merge 726a228dfb ws/fast-export-with-revision-options later to maint).
-
- * Perf tests were run with end-user's shell, but it has been
-   corrected to use the shell specified by $TEST_SHELL_PATH.
-   (merge 9ccab75608 ja/perf-use-specified-shell later to maint).
-
- * Fix dependency rules to generate hook-list.h header file.
-   (merge d3fd1a6667 ab/makefile-hook-list-dependency-fix later to maint).
-
- * "git stash" by default triggers its "push" action, but its
-   implementation also made "git stash -h" to show short help only for
-   "git stash push", which has been corrected.
-   (merge ca7990cea5 ab/do-not-limit-stash-help-to-push later to maint).
-
- * "git apply --3way" bypasses the attempt to do a three-way
-   application in more cases to address the regression caused by the
-   recent change to use direct application as a fallback.
-   (merge 34d607032c jz/apply-3-corner-cases later to maint).
-
- * Fix performance-releated bug in "git subtree" (in contrib/).
-   (merge 3ce8888fb4 jl/subtree-check-parents-argument-passing-fix later to maint).
-
- * Extend the guidance to choose the base commit to build your work
-   on, and hint/nudge contributors to read others' changes.
-   (merge fdfae830f8 jc/doc-submitting-patches-choice-of-base later to maint).
-
- * A corner case bug in the ort merge strategy has been corrected.
-   (merge d30126c20d en/merge-ort-renorm-with-rename-delete-conflict-fix later to maint).
-
- * "git stash apply" forgot to attempt restoring untracked files when
-   it failed to restore changes to tracked ones.
-   (merge 71cade5a0b en/stash-df-fix later to maint).
-
- * Other code cleanup, docfix, build fix, etc.
-   (merge 74db416c9c cw/protocol-v2-doc-fix later to maint).
-   (merge f9b2b6684d ja/doc-cleanup later to maint).
-   (merge 7d1b866778 jc/fix-first-object-walk later to maint).
-   (merge 538ac74604 js/trace2-avoid-recursive-errors later to maint).
-   (merge 152923b132 jk/t5319-midx-corruption-test-deflake later to maint).
-   (merge 9081a421a6 ab/checkout-branch-info-leakfix later to maint).
-   (merge 42c456ff81 rs/mergesort later to maint).
-   (merge ad506e6780 tl/midx-docfix later to maint).
-   (merge bf5b83fd8a hk/ci-checkwhitespace-commentfix later to maint).
-   (merge 49f1eb3b34 jk/refs-g11-workaround later to maint).
-   (merge 7d3fc7df70 jt/midx-doc-fix later to maint).
-   (merge 7b089120d9 hn/create-reflog-simplify later to maint).
-   (merge 9e12400da8 cb/mingw-gmtime-r later to maint).
-   (merge 0bf0de6cc7 tb/pack-revindex-on-disk-cleanup later to maint).
-   (merge 2c68f577fc ew/cbtree-remove-unused-and-broken-cb-unlink later to maint).
-   (merge eafd6e7e55 ab/die-with-bug later to maint).
-   (merge 91028f7659 jc/grep-patterntype-default-doc later to maint).
-   (merge 47ca93d071 ds/repack-fixlets later to maint).
-   (merge e6a9bc0c60 rs/t4202-invert-grep-test-fix later to maint).
-   (merge deb5407a42 gh/gpg-doc-markup-fix later to maint).
-   (merge 999bba3e0b rs/daemon-plug-leak later to maint).
-   (merge 786eb1ba39 js/l10n-mention-ngettext-early-in-readme later to maint).
-   (merge 2f12b31b74 ab/makefile-msgfmt-wo-stats later to maint).

Documentation/RelNotes/2.8.0.txt

@@ -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 pathname with wildcard
+   rev, i.e. the object named by the the pathname with wildcard
    characters in a tree object.
    (merge aac4fac nd/dwim-wildcards-as-pathspecs later to maint).
 

Documentation/SubmittingPatches

@@ -19,10 +19,8 @@ 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 other topics that are in `next`, but not in
-  `master`, fork a branch from the tip of `master`, merge these topics
-  to the branch, and work on that branch.  You can remind yourself of
-  how you prepared the base with `git log --first-parent master..`.
+  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
   be based on the tip of that topic. If the topic has not been merged
@@ -30,10 +28,10 @@ change is relevant to.
   into the series.
 
 * In the exceptional case that a new feature depends on several topics
-  not in `master`, start working on `next` or `seen` privately and
-  send out patches only for discussion. Once your new feature starts
-  to stabilize, you would have to rebase it (see the "depends on other
-  topics" above).
+  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.
 
 * Some parts of the system have dedicated maintainers with their own
   repositories (see the section "Subsystems" below).  Changes to
@@ -73,17 +71,13 @@ Make sure that you have tests for the bug you are fixing.  See
 [[tests]]
 When adding a new feature, make sure that you have new tests to show
 the feature triggers the new behavior when it should, and to show the
-feature does not trigger when it shouldn't.  After any code change,
-make sure that the entire test suite passes.  When fixing a bug, make
-sure you have new tests that break if somebody else breaks what you
-fixed by accident to avoid regression.  Also, try merging your work to
-'next' and 'seen' and make sure the tests still pass; topics by others
-that are still in flight may have unexpected interactions with what
-you are trying to do in your topic.
+feature does not trigger when it shouldn't.  After any code change, make
+sure that the entire test suite passes.
 
-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.
+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.
 
 Do not forget to update the documentation to describe the updated
 behavior and make sure that the resulting documentation set formats
@@ -123,13 +117,10 @@ 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]]
-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.
+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...".
 
 [[meaningful-message]]
 The body should provide a meaningful commit message, which:
@@ -151,21 +142,8 @@ without external resources. Instead of giving a URL to a mailing list
 archive, summarize the relevant points of the discussion.
 
 [[commit-reference]]
-
-There are a few reasons why you may want to refer to another commit in
-the "more stable" part of the history (i.e. on branches like `maint`,
-`master`, and `next`):
-
-. A commit that introduced the root cause of a bug you are fixing.
-
-. A commit that introduced a feature that you are enhancing.
-
-. A commit that conflicts with your work when you made a trial merge
-  of your work into `next` and `seen` for testing.
-
-When you reference a commit on a more stable branch (like `master`,
-`maint` and `next`), use the format "abbreviated hash (subject,
-date)", like this:
+If you want to reference a previous commit in the history of a stable
+branch, use the format "abbreviated hash (subject, date)", like this:
 
 ....
 	Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
@@ -186,85 +164,6 @@ 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.
 
@@ -279,11 +178,9 @@ Please make sure your patch does not add commented out debugging code,
 or include any extra files which do not relate to what your patch
 is trying to achieve. Make sure to review
 your patch after generating it, to ensure accuracy.  Before
-sending out, please make sure it cleanly applies to the base you
-have chosen in the "Decide what to base your work on" section,
-and unless it targets the `master` branch (which is the default),
-mark your patches as such.
-
+sending out, please make sure it cleanly applies to the `master`
+branch head.  If you are preparing a work based on "next" branch,
+that is fine, but please mark it as such.
 
 [[send-patches]]
 === Sending your patches.
@@ -387,10 +284,7 @@ Security mailing list{security-ml-ref}.
 Send your patch with "To:" set to the mailing list, with "cc:" listing
 people who are involved in the area you are touching (the `git
 contacts` command in `contrib/contacts/` can help to
-identify them), to solicit comments and reviews.  Also, when you made
-trial merges of your topic to `next` and `seen`, you may have noticed
-work by others conflicting with your changes.  There is a good possibility
-that these people may know the area you are touching well.
+identify them), to solicit comments and reviews.
 
 :current-maintainer: footnote:[The current maintainer: gitster@pobox.com]
 :git-ml: footnote:[The mailing list: git@vger.kernel.org]
@@ -405,6 +299,86 @@ Do not forget to add trailers such as `Acked-by:`, `Reviewed-by:` and
 `Tested-by:` lines as necessary to credit people who helped your
 patch, and "cc:" them when sending such a final version for inclusion.
 
+[[sign-off]]
+=== Certify your work by adding your `Signed-off-by` trailer
+
+To improve tracking of who did what, we ask you to certify that you
+wrote the patch or have the right to pass it on under the same license
+as ours, by "signing off" your patch.  Without sign-off, we cannot
+accept your patches.
+
+If (and only if) you certify the below D-C-O:
+
+[[dco]]
+.Developer's Certificate of Origin 1.1
+____
+By making a contribution to this project, I certify that:
+
+a. The contribution was created in whole or in part by me and I
+   have the right to submit it under the open source license
+   indicated in the file; or
+
+b. The contribution is based upon previous work that, to the best
+   of my knowledge, is covered under an appropriate open source
+   license and I have the right under that license to submit that
+   work with modifications, whether created in whole or in part
+   by me, under the same open source license (unless I am
+   permitted to submit under a different license), as indicated
+   in the file; or
+
+c. The contribution was provided directly to me by some other
+   person who certified (a), (b) or (c) and I have not modified
+   it.
+
+d. I understand and agree that this project and the contribution
+   are public and that a record of the contribution (including all
+   personal information I submit with it, including my sign-off) is
+   maintained indefinitely and may be redistributed consistent with
+   this project or the open source license(s) involved.
+____
+
+you add a "Signed-off-by" trailer to your commit, that looks like
+this:
+
+....
+	Signed-off-by: Random J Developer <random@developer.example.org>
+....
+
+This line can be added by Git if you run the git-commit command with
+the -s option.
+
+Notice that you can place your own `Signed-off-by` trailer when
+forwarding somebody else's patch with the above rules for
+D-C-O.  Indeed you are encouraged to do so.  Do not forget to
+place an in-body "From: " line at the beginning to properly attribute
+the change to its true author (see (2) above).
+
+This procedure originally came from the Linux kernel project, so our
+rule is quite similar to theirs, but what exactly it means to sign-off
+your patch differs from project to project, so it may be different
+from that of the project you are accustomed to.
+
+[[real-name]]
+Also notice that a real name is used in the `Signed-off-by` trailer. Please
+don't hide your real name.
+
+[[commit-trailers]]
+If you like, you can put extra tags at the end:
+
+. `Reported-by:` is used to credit someone who found the bug that
+  the patch attempts to fix.
+. `Acked-by:` says that the person who is more familiar with the area
+  the patch attempts to modify liked the patch.
+. `Reviewed-by:`, unlike the other tags, can only be offered by the
+  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:".
+
 == Subsystems with dedicated maintainers
 
 Some parts of the system have dedicated maintainers with their own
@@ -473,12 +447,13 @@ their trees themselves.
   entitled "What's cooking in git.git" and "What's in git.git" giving
   the status of various proposed changes.
 
-== GitHub CI[[GHCI]]
+[[travis]]
+== GitHub-Travis CI hints
 
-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.
+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
 
 Follow these steps for the initial setup:
 
@@ -486,18 +461,31 @@ Follow these steps for the initial setup:
   You can find detailed instructions how to fork here:
   https://help.github.com/articles/fork-a-repo/
 
-After the initial setup, CI will run whenever you push new changes
+. 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
 to your fork of Git on GitHub.  You can monitor the test state of all your
-branches here: `https://github.com/<Your GitHub handle>/git/actions/workflows/main.yml`
+branches here: https://travis-ci.org/__<Your GitHub handle>__/git/branches
 
 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 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.
+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
 
-Then fix the problem and push your fix to your GitHub fork. This will
-trigger a new CI build to ensure all tests pass.
+Fix the problem and push your fix to your Git fork.  This will trigger
+a new Travis CI build to ensure all tests pass.
 
 [[mua]]
 == MUA specific hints

Documentation/blame-options.txt

@@ -136,16 +136,5 @@ take effect.
 	option.  An empty file name, `""`, will clear the list of revs from
 	previously processed files.
 
---color-lines::
-	Color line annotations in the default format differently if they come from
-	the same commit as the preceding line. This makes it easier to distinguish
-	code blocks introduced by different commits. The color defaults to cyan and
-	can be adjusted using the `color.blame.repeatedLines` config option.
-
---color-by-age::
-	Color line annotations depending on the age of the line in the default format.
-	The `color.blame.highlightRecent` config option controls what color is used for
-	each range of age.
-
 -h::
 	Show help message.

Documentation/config.txt

@@ -262,19 +262,11 @@ color::
        colors (at most two, one for foreground and one for background)
        and attributes (as many as you want), separated by spaces.
 +
-The basic colors accepted are `normal`, `black`, `red`, `green`,
-`yellow`, `blue`, `magenta`, `cyan`, `white` and `default`.  The first
-color given is the foreground; the second is the background.  All the
-basic colors except `normal` and `default` have a bright variant that can
-be specified by prefixing the color with `bright`, like `brightred`.
-+
-The color `normal` makes no change to the color. It is the same as an
-empty string, but can be used as the foreground color when specifying a
-background color alone (for example, "normal red").
-+
-The color `default` explicitly resets the color to the terminal default,
-for example to specify a cleared background. Although it varies between
-terminals, this is usually not the same as setting to "white black".
+The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
+`blue`, `magenta`, `cyan` and `white`.  The first color given is the
+foreground; the second is the background.  All the basic colors except
+`normal` have a bright variant that can be specified by prefixing the
+color with `bright`, like `brightred`.
 +
 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
@@ -288,11 +280,6 @@ The position of any attributes with respect to the colors
 be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
 `no-ul`, etc).
 +
-The pseudo-attribute `reset` resets all colors and attributes before
-applying the specified coloring. For example, `reset green` will result
-in a green foreground and default background without any active
-attributes.
-+
 An empty color string produces no color effect at all. This can be used
 to avoid coloring specific elements without disabling color entirely.
 +
@@ -311,15 +298,6 @@ pathname::
 	tilde expansion happens to such a string: `~/`
 	is expanded to the value of `$HOME`, and `~user/` to the
 	specified user's home directory.
-+
-If a path starts with `%(prefix)/`, the remainder is interpreted as a
-path relative to Git's "runtime prefix", i.e. relative to the location
-where Git itself was installed. For example, `%(prefix)/bin/` refers to
-the directory in which the Git executable itself lives. If Git was
-compiled without runtime prefix support, the compiled-in prefix will be
-substituted instead. In the unlikely event that a literal path needs to
-be specified that should _not_ be expanded, it needs to be prefixed by
-`./`, like so: `./%(prefix)/bin`.
 
 
 Variables
@@ -462,6 +440,8 @@ include::config/rerere.txt[]
 
 include::config/reset.txt[]
 
+include::config/safe.txt[]
+
 include::config/sendemail.txt[]
 
 include::config/sequencer.txt[]

Documentation/config/advice.txt

@@ -44,9 +44,6 @@ advice.*::
 		Shown when linkgit:git-push[1] rejects a forced update of
 		a branch when its remote-tracking ref has updates that we
 		do not have locally.
-	skippedCherryPicks::
-		Shown when linkgit:git-rebase[1] skips a commit that has already
-		been cherry-picked onto the upstream branch.
 	statusAheadBehind::
 		Shown when linkgit:git-status[1] computes the ahead/behind
 		counts for a local ref compared to its remote tracking ref,
@@ -122,8 +119,4 @@ advice.*::
 	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.
 --

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.markUnblamableLines::
+blame.markUnblamables::
 	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].

Documentation/config/branch.txt

@@ -7,8 +7,7 @@ branch.autoSetupMerge::
 	automatic setup is done; `true` -- automatic setup is done when the
 	starting point is a remote-tracking branch; `always` --
 	automatic setup is done when the starting point is either a
-	local branch or remote-tracking branch; `inherit` -- if the starting point
-	has a tracking configuration, it is copied to the new
+	local branch or remote-tracking
 	branch. This option defaults to true.
 
 branch.autoSetupRebase::
@@ -86,6 +85,10 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
 so that the local merge commits are included in the rebase (see
 linkgit:git-rebase[1] for details).
 +
+When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
+`--preserve-merges` along to 'git rebase' so that locally committed merge
+commits will not be flattened by running 'git pull'.
++
 When the value is `interactive` (or just 'i'), the rebase is run in interactive
 mode.
 +

Documentation/config/checkout.txt

@@ -21,24 +21,3 @@ 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.

Documentation/config/clone.txt

@@ -2,7 +2,3 @@ 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]

Documentation/config/color.txt

@@ -9,27 +9,26 @@ color.advice.hint::
 	Use customized color for hints.
 
 color.blame.highlightRecent::
-	Specify the line annotation color for `git blame --color-by-age`
-	depending upon the age of the line.
+	This can be used to color the metadata of a blame line depending
+	on age of the line.
 +
-This setting should be set to a comma-separated list of color and
-date settings, starting and ending with a color, the dates should be
-set from oldest to newest. The metadata will be colored with the
-specified colors if the line was introduced before the given
-timestamp, overwriting older timestamped colors.
+This setting should be set to a comma-separated list of color and date settings,
+starting and ending with a color, the dates should be set from oldest to newest.
+The metadata will be colored given the colors if the line was introduced
+before the given timestamp, overwriting older timestamped colors.
 +
-Instead of an absolute timestamp relative timestamps work as well,
-e.g. `2.weeks.ago` is valid to address anything older than 2 weeks.
+Instead of an absolute timestamp relative timestamps work as well, e.g.
+2.weeks.ago is valid to address anything older than 2 weeks.
 +
-It defaults to `blue,12 month ago,white,1 month ago,red`, which
-colors everything older than one year blue, recent changes between
-one month and one year old are kept white, and lines introduced
-within the last month are colored red.
+It defaults to 'blue,12 month ago,white,1 month ago,red', which colors
+everything older than one year blue, recent changes between one month and
+one year old are kept white, and lines introduced within the last month are
+colored red.
 
 color.blame.repeatedLines::
-	Use the specified color to colorize line annotations for
-	`git blame --color-lines`, if they come from the same commit as the
-	preceding line. Defaults to cyan.
+	Use the customized color for the part of git-blame output that
+	is repeated meta information per line (such as commit id,
+	author name, date and timezone). Defaults to cyan.
 
 color.branch::
 	A boolean to enable/disable color in the output of
@@ -105,12 +104,9 @@ color.grep.<slot>::
 `matchContext`;;
 	matching text in context lines
 `matchSelected`;;
-	matching text in selected lines. Also, used to customize the following
-	linkgit:git-log[1] subcommands: `--grep`, `--author` and `--committer`.
+	matching text in selected lines
 `selected`;;
-	non-matching text in selected lines. Also, used to customize the
-	following linkgit:git-log[1] subcommands: `--grep`, `--author` and
-	`--committer`.
+	non-matching text in selected lines
 `separator`;;
 	separators between fields on a line (`:`, `-`, and `=`)
 	and between hunks (`--`)
@@ -131,9 +127,8 @@ color.interactive.<slot>::
 	interactive commands.
 
 color.pager::
-	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.
+	A boolean to enable/disable colored output when the pager is in
+	use (default is true).
 
 color.push::
 	A boolean to enable/disable color in push errors. May be set to

Documentation/config/commitgraph.txt

@@ -1,9 +1,3 @@
-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]).

Documentation/config/diff.txt

@@ -118,10 +118,9 @@ diff.orderFile::
 	relative to the top of the working tree.
 
 diff.renameLimit::
-	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.
+	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.
 
 diff.renames::
 	Whether and how Git detects renames.  If set to "false",

Documentation/config/fetch.txt

@@ -69,8 +69,7 @@ fetch.negotiationAlgorithm::
 	setting defaults to "skipping".
 	Unknown values will cause 'git fetch' to error out.
 +
-See also the `--negotiate-only` and `--negotiation-tip` options to
-linkgit:git-fetch[1].
+See also the `--negotiation-tip` option for linkgit:git-fetch[1].
 
 fetch.showForcedUpdates::
 	Set to false to enable `--no-show-forced-updates` in

Documentation/config/gpg.txt

@@ -11,13 +11,13 @@ gpg.program::
 
 gpg.format::
 	Specifies which key format to use when signing with `--gpg-sign`.
-	Default is "openpgp". Other possible values are "x509", "ssh".
+	Default is "openpgp" and another possible value is "x509".
 
 gpg.<format>.program::
 	Use this to customize the program used for the signing format you
 	chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
 	be used as a legacy synonym for `gpg.openpgp.program`. The default
-	value for `gpg.x509.program` is "gpgsm" and `gpg.ssh.program` is "ssh-keygen".
+	value for `gpg.x509.program` is "gpgsm".
 
 gpg.minTrustLevel::
 	Specifies a minimum trust level for signature verification.  If
@@ -33,47 +33,3 @@ gpg.minTrustLevel::
 * `marginal`
 * `fully`
 * `ultimate`
-
-gpg.ssh.defaultKeyCommand::
-	This command that will be run when user.signingkey is not set and a ssh
-	signature is requested. On successful exit a valid ssh public key is
-	expected in the	first line of its output. To automatically use the first
-	available key from your ssh-agent set this to "ssh-add -L".
-
-gpg.ssh.allowedSignersFile::
-	A file containing ssh public keys which you are willing to trust.
-	The file consists of one or more lines of principals followed by an ssh
-	public key.
-	e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...`
-	See ssh-keygen(1) "ALLOWED SIGNERS" for details.
-	The principal is only used to identify the key and is available when
-	verifying a signature.
-+
-SSH has no concept of trust levels like gpg does. To be able to differentiate
-between valid signatures and trusted signatures the trust level of a signature
-verification is set to `fully` when the public key is present in the allowedSignersFile.
-Otherwise the trust level is `undefined` and git verify-commit/tag will fail.
-+
-This file can be set to a location outside of the repository and every developer
-maintains their own trust store. A central repository server could generate this
-file automatically from ssh keys with push access to verify the code against.
-In a corporate setting this file is probably generated at a global location
-from automation that already handles developer ssh keys.
-+
-A repository that only allows signed commits can store the file
-in the repository itself using a path relative to the top-level of the working tree.
-This way only committers with an already valid key can add or change keys in the keyring.
-+
-Since OpensSSH 8.8 this file allows specifying a key lifetime using valid-after &
-valid-before options. Git will mark signatures as valid if the signing key was
-valid at the time of the signatures creation. This allows users to change a
-signing key without invalidating all previously made signatures.
-+
-Using a SSH CA key with the cert-authority option
-(see ssh-keygen(1) "CERTIFICATES") is also valid.
-
-gpg.ssh.revocationFile::
-	Either a SSH KRL or a list of revoked public keys (without the principal prefix).
-	See ssh-keygen(1) for details.
-	If a public key is found in this file then it will always be treated
-	as having trust level "never" and signatures will show as invalid.

Documentation/config/grep.txt

@@ -8,8 +8,7 @@ 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 use the `grep.extendedRegexp` option to choose
-	between 'basic' and 'extended'.
+	value 'default' will return to the default matching behavior.
 
 grep.extendedRegexp::
 	If set to true, enable `--extended-regexp` option by default. This

Documentation/config/gui.txt

@@ -11,7 +11,7 @@ gui.displayUntracked::
 	in the file list. The default is "true".
 
 gui.encoding::
-	Specifies the default character encoding to use for displaying of
+	Specifies the default encoding to use for displaying of
 	file contents in linkgit:git-gui[1] and linkgit:gitk[1].
 	It can be overridden by setting the 'encoding' attribute
 	for relevant files (see linkgit:gitattributes[5]).

Documentation/config/help.txt

@@ -9,15 +9,13 @@ help.format::
 
 help.autoCorrect::
 	If git detects typos and can identify exactly one valid command similar
-	to the error, git will try to suggest the correct command or even
-	run the suggestion automatically. Possible config values are:
-	 - 0 (default): show the suggested command.
-	 - positive number: run the suggested command after specified
-deciseconds (0.1 sec).
-	 - "immediate": run the suggested command immediately.
-	 - "prompt": show the suggestion and prompt for confirmation to run
-the command.
-	 - "never": don't run or show any suggested command.
+	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

Documentation/config/index.txt

@@ -14,11 +14,6 @@ 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.

Documentation/config/log.txt

@@ -24,11 +24,6 @@ log.excludeDecoration::
 	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`,

Documentation/config/merge.txt

@@ -4,14 +4,7 @@ merge.conflictStyle::
 	shows a `<<<<<<<` conflict marker, changes made by one side,
 	a `=======` marker, changes made by the other side, and then
 	a `>>>>>>>` marker.  An alternate style, "diff3", adds a `|||||||`
-	marker and the original text before the `=======` marker.  The
-	"merge" style tends to produce smaller conflict regions than diff3,
-	both because of the exclusion of the original text, and because
-	when a subset of lines match on the two sides they are just pulled
-	out of the conflict region.  Another alternate style, "zdiff3", is
-	similar to diff3 but removes matching lines on the two sides from
-	the conflict region when those matching lines appear near either
-	the beginning or end of a conflict region.
+	marker and the original text before the `=======` marker.
 
 merge.defaultToUpstream::
 	If merge is called without any commit argument, merge the upstream
@@ -21,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. Defaults to true.
+	these tracking branches are merged.
 
 merge.ff::
 	By default, Git does not create an extra merge commit when merging
@@ -40,12 +33,10 @@ merge.verifySignatures::
 include::fmt-merge-msg.txt[]
 
 merge.renameLimit::
-	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.
+	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.
 
 merge.renames::
 	Whether Git detects renames.  If set to "false", rename detection

Documentation/config/pack.txt

@@ -99,23 +99,12 @@ 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.
-+
-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.
+	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.
 
 pack.useBitmaps::
 	When true, git will use pack bitmaps (if available) when packing
@@ -133,21 +122,6 @@ pack.useSparse::
 	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`.
 
@@ -159,10 +133,6 @@ pack.writeBitmapHashCache::
 	between an older, bitmapped pack and objects that have been
 	pushed since the last gc). The downside is that it consumes 4
 	bytes per object of disk space. Defaults to true.
-+
-When writing a multi-pack reachability bitmap, no new namehashes are
-computed; instead, any namehashes stored in an existing bitmap are
-permuted into their appropriate location when writing a new bitmap.
 
 pack.writeReverseIndex::
 	When true, git will write a corresponding .rev file (see:

Documentation/config/pull.txt

@@ -18,6 +18,10 @@ When `merges` (or just 'm'), pass the `--rebase-merges` option to 'git rebase'
 so that the local merge commits are included in the rebase (see
 linkgit:git-rebase[1] for details).
 +
+When `preserve` (or just 'p', deprecated in favor of `merges`), also pass
+`--preserve-merges` along to 'git rebase' so that locally committed merge
+commits will not be flattened by running 'git pull'.
++
 When the value is `interactive` (or just 'i'), the rebase is run in interactive
 mode.
 +

Documentation/config/push.txt

@@ -24,14 +24,15 @@ push.default::
 
 * `tracking` - This is a deprecated synonym for `upstream`.
 
-* `simple` - pushes the current branch with the same name on the remote.
+* `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.
 +
-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.
+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.
 +
-This mode is the default since Git 2.0, and is the safest option suited for
-beginners.
+This mode has become the default in Git 2.0.
 
 * `matching` - push all branches having the same name on both ends.
   This makes the repository you are pushing to remember the set of
@@ -119,10 +120,3 @@ push.useForceIfIncludes::
 	`--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.

Documentation/config/rebase.txt

@@ -1,3 +1,10 @@
+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

Documentation/config/safe.txt

@@ -0,0 +1,28 @@
+safe.directory::
+	These config entries specify Git-tracked directories that are
+	considered safe even if they are owned by someone other than the
+	current user. By default, Git will refuse to even parse a Git
+	config of a repository owned by someone else, let alone run its
+	hooks, and this config setting allows users to specify exceptions,
+	e.g. for intentionally shared repositories (see the `--shared`
+	option in linkgit:git-init[1]).
++
+This is a multi-valued setting, i.e. you can add more than one directory
+via `git config --add`. To reset the list of safe directories (e.g. to
+override any such directories specified in the system config), add a
+`safe.directory` entry with an empty value.
++
+This config setting is only respected when specified in a system or global
+config, not when it is specified in a repository config or via the command
+line option `-c safe.directory=<path>`.
++
+The value of this setting is interpolated, i.e. `~/<path>` expands to a
+path relative to the home directory and `%(prefix)/<path>` expands to a
+path relative to Git's (runtime) prefix.
++
+To completely opt-out of this security check, set `safe.directory` to the
+string `*`. This will allow all repositories to be treated as if their
+directory was listed in the `safe.directory` list. If `safe.directory=*`
+is set in system config and you want to re-enable this protection, then
+initialize your list with an empty value before listing the repositories
+that you deem safe.

Documentation/config/sendemail.txt

@@ -8,6 +8,9 @@ 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.

Documentation/config/stash.txt

@@ -5,11 +5,6 @@ stash.useBuiltin::
 	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
 	option will show the stash entry in patch form.  Defaults to false.

Documentation/config/submodule.txt

@@ -58,9 +58,8 @@ submodule.active::
 	commands. See linkgit:gitsubmodules[7] for details.
 
 submodule.recurse::
-	A boolean indicating if commands should enable the `--recurse-submodules`
-	option by default.
-	Applies to all commands that support this option
+	Specifies if commands recurse into submodules by default. This
+	applies to all commands that have a `--recurse-submodules` option
 	(`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`,
 	`restore` and `switch`) except `clone` and `ls-files`.
 	Defaults to false.

Documentation/config/transfer.txt

@@ -52,17 +52,13 @@ 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. In
-order to match refs before stripping, add a `^` in front of the ref name. If
-you combine `!` and `^`, `!` must be specified first.
-+
+reference before it is matched against `transfer.hiderefs` patterns.
 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. 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).
+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.
 +
 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

Documentation/config/uploadpack.txt

@@ -59,16 +59,15 @@ uploadpack.allowFilter::
 
 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.
+	below configuration variable).
 	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`.
+	`blob:limit`, `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

Documentation/config/user.txt

@@ -36,13 +36,3 @@ user.signingKey::
 	commit, you can override the default selection with this variable.
 	This option is passed unchanged to gpg's --local-user parameter,
 	so you may specify a key using any method that gpg supports.
-	If gpg.format is set to `ssh` this can contain the path to either
-	your private ssh key or the public key when ssh-agent is used.
-	Alternatively it can contain a public key prefixed with `key::`
-	directly (e.g.: "key::ssh-rsa XXXXXX identifier"). The private key
-	needs to be available via ssh-agent. If not set git will call
-	gpg.ssh.defaultKeyCommand (e.g.: "ssh-add -L") and try to use the
-	first key available. For backward compatibility, a raw key which
-	begins with "ssh-", such as "ssh-rsa XXXXXX identifier", is treated
-	as "key::ssh-rsa XXXXXX identifier", but this form is deprecated;
-	use the `key::` form instead.

Documentation/date-formats.txt

@@ -5,9 +5,9 @@ The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables
 support the following date formats:
 
 Git internal format::
-	It is `<unix-timestamp> <time-zone-offset>`, where
-	`<unix-timestamp>` is the number of seconds since the UNIX epoch.
-	`<time-zone-offset>` is a positive or negative offset from UTC.
+	It is `<unix timestamp> <time zone offset>`, where `<unix
+	timestamp>` is the number of seconds since the UNIX epoch.
+	`<time zone offset>` is a positive or negative offset from UTC.
 	For example CET (which is 1 hour ahead of UTC) is `+0100`.
 
 RFC 2822::

Documentation/diff-format.txt

@@ -59,7 +59,7 @@ Possible status letters are:
 - D: deletion of a file
 - M: modification of the contents or mode of a file
 - R: renaming of a file
-- T: change in the type of the file (regular file, symbolic link or submodule)
+- T: change in the type of the file
 - U: file is unmerged (you must complete the merge before it can
   be committed)
 - X: "unknown" change type (most probably a bug, please report it)

Documentation/diff-generate-patch.txt

@@ -11,7 +11,7 @@ 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
-(see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5]).
+(see linkgit:git[1]).
 
 What the -p option produces is slightly different from the traditional
 diff format:
@@ -74,11 +74,6 @@ 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
 --------------------

Documentation/diff-options.txt

@@ -34,7 +34,7 @@ endif::git-diff[]
 endif::git-format-patch[]
 
 ifdef::git-log[]
---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
+--diff-merges=(off|none|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
@@ -45,24 +45,17 @@ ifdef::git-log[]
 	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:::
+--diff-merges=m:::
+-m:::
 	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.
+	for each parent. `-m` doesn't produce any output without `-p`.
 +
 --diff-merges=combined:::
 --diff-merges=c:::
@@ -300,14 +293,11 @@ explained for the configuration variable `core.quotePath` (see
 linkgit:git-config[1]).
 
 --name-only::
-	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.
+	Show only names of changed files.
 
 --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
@@ -588,17 +578,11 @@ 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 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.
+	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.
 
 ifndef::git-format-patch[]
 --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::

Documentation/fetch-options.txt

@@ -62,17 +62,8 @@ 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` 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].
+See also the `fetch.negotiationAlgorithm` configuration variable
+documented in linkgit:git-config[1].
 
 --dry-run::
 	Show what would be done, without making any changes.
@@ -119,11 +110,6 @@ ifndef::git-pull[]
 	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::
 	Before fetching, remove any remote-tracking references that no

Documentation/git-add.txt

@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
-	  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]] [--sparse]
+	  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
 	  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
 	  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
 	  [--] [<pathspec>...]
@@ -79,13 +79,6 @@ in linkgit:gitglossary[7].
 --force::
 	Allow adding otherwise ignored files.
 
---sparse::
-	Allow updating index entries outside of the sparse-checkout cone.
-	Normally, `git add` refuses to update index entries whose paths do
-	not fit within the sparse-checkout cone, since those files might
-	be removed from the working tree without warning. See
-	linkgit:git-sparse-checkout[1] for more details.
-
 -i::
 --interactive::
 	Add modified contents in the working tree interactively to

Documentation/git-am.txt

@@ -15,10 +15,8 @@ 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>]
-	 [--empty=(stop|drop|keep)]
 	 [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
 
 DESCRIPTION
 -----------
@@ -61,17 +59,6 @@ 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]).
-
---empty=(stop|drop|keep)::
-	By default, or when the option is set to 'stop', the command
-	errors out on an input e-mail message lacking a patch
-	and stops into the middle of the current am session. When this
-	option is set to 'drop', skip such an e-mail message instead.
-	When this option is set to 'keep', create an empty commit,
-	recording the contents of the e-mail message as its log.
-
 -m::
 --message-id::
 	Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
@@ -187,8 +174,6 @@ default.   You can use `--no-utf8` to override this.
 
 --abort::
 	Restore the original branch and abort the patching operation.
-	Revert contents of files involved in the am operation to their
-	pre-am state.
 
 --quit::
 	Abort the patching operation but keep HEAD and the index
@@ -200,11 +185,6 @@ default.   You can use `--no-utf8` to override this.
 	the e-mail message; if `diff`, show the diff portion only.
 	Defaults to `raw`.
 
---allow-empty::
-	After a patch failure on an input e-mail message lacking a patch,
-	create an empty commit with the contents of the e-mail message
-	as its log message.
-
 DISCUSSION
 ----------
 

Documentation/git-apply.txt

@@ -16,7 +16,7 @@ SYNOPSIS
 	  [--ignore-space-change | --ignore-whitespace]
 	  [--whitespace=(nowarn|warn|fix|error|error-all)]
 	  [--exclude=<path>] [--include=<path>] [--directory=<root>]
-	  [--verbose | --quiet] [--unsafe-paths] [--allow-empty] [<patch>...]
+	  [--verbose] [--unsafe-paths] [<patch>...]
 
 DESCRIPTION
 -----------
@@ -84,13 +84,12 @@ OPTIONS
 
 -3::
 --3way::
-	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
+	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
 	conflict markers in the files in the working tree for the user to
-	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.
+	resolve.  This option implies the `--index` option, and is incompatible
+	with the `--reject` and the `--cached` options.
 
 --build-fake-ancestor=<file>::
 	Newer 'git diff' output has embedded 'index information'
@@ -228,11 +227,6 @@ behavior:
 	current patch being applied will be printed. This option will cause
 	additional information to be reported.
 
--q::
---quiet::
-	Suppress stderr output. Messages about patch status and progress
-	will not be printed.
-
 --recount::
 	Do not trust the line counts in the hunk headers, but infer them
 	by inspecting the patch (e.g. after editing the patch without
@@ -256,10 +250,6 @@ When `git apply` is used as a "better GNU patch", the user can pass
 the `--unsafe-paths` option to override this safety check.  This option
 has no effect when `--index` or `--cached` is in use.
 
---allow-empty::
-	Don't return error for patches containing no diff. This includes
-	empty patches and patches with commit text only.
-
 CONFIGURATION
 -------------
 

Documentation/git-archimport.txt

@@ -9,14 +9,14 @@ git-archimport - Import a GNU Arch repository into Git
 SYNOPSIS
 --------
 [verse]
-'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D <depth>] [-t <tempdir>]
-	       <archive>/<branch>[:<git-branch>]...
+'git archimport' [-h] [-v] [-o] [-a] [-f] [-T] [-D depth] [-t tempdir]
+               <archive/branch>[:<git-branch>] ...
 
 DESCRIPTION
 -----------
 Imports a project from one or more GNU Arch repositories.
 It will follow branches
-and repositories within the namespaces defined by the <archive>/<branch>
+and repositories within the namespaces defined by the <archive/branch>
 parameters supplied. If it cannot find the remote branch a merge comes from
 it will just import it as a regular commit. If it can find it, it will mark it
 as a merge whenever possible (see discussion below).
@@ -27,7 +27,7 @@ import new branches within the provided roots.
 
 It expects to be dealing with one project only. If it sees
 branches that have different roots, it will refuse to run. In that case,
-edit your <archive>/<branch> parameters to define clearly the scope of the
+edit your <archive/branch> parameters to define clearly the scope of the
 import.
 
 'git archimport' uses `tla` extensively in the background to access the
@@ -42,7 +42,7 @@ incremental imports.
 
 While 'git archimport' will try to create sensible branch names for the
 archives that it imports, it is also possible to specify Git branch names
-manually.  To do so, write a Git branch name after each <archive>/<branch>
+manually.  To do so, write a Git branch name after each <archive/branch>
 parameter, separated by a colon.  This way, you can shorten the Arch
 branch names and convert Arch jargon to Git jargon, for example mapping a
 "PROJECT{litdd}devo{litdd}VERSION" branch to "master".
@@ -104,8 +104,8 @@ OPTIONS
 	Override the default tempdir.
 
 
-<archive>/<branch>::
-	<archive>/<branch> identifier in a format that `tla log` understands.
+<archive/branch>::
+	Archive/branch identifier in a format that `tla log` understands.
 
 
 GIT

Documentation/git-archive.txt

@@ -93,19 +93,12 @@ BACKEND EXTRA OPTIONS
 
 zip
 ~~~
--<digit>::
-	Specify compression level.  Larger values allow the command
-	to spend more time to compress to smaller size.  Supported
-	values are from `-0` (store-only) to `-9` (best ratio).
-	Default is `-6` if not given.
+-0::
+	Store the files instead of deflating them.
+-9::
+	Highest and slowest compression level.  You can specify any
+	number from 1 to 9 to adjust compression speed and ratio.
 
-tar
-~~~
--<number>::
-	Specify compression level. The value will be passed to the
-	compression command configured in `tar.<format>.command`. See
-	manual page of the configured command for the list of supported
-	levels and the default level if this option isn't specified.
 
 CONFIGURATION
 -------------

Documentation/git-blame.txt

@@ -11,8 +11,8 @@ SYNOPSIS
 'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
 	    [-L <range>] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
 	    [--ignore-rev <rev>] [--ignore-revs-file <file>]
-	    [--color-lines] [--color-by-age] [--progress] [--abbrev=<n>]
-	    [<rev> | --contents <file> | --reverse <rev>..<rev>] [--] <file>
+	    [--progress] [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>..<rev>]
+	    [--] <file>
 
 DESCRIPTION
 -----------
@@ -93,19 +93,6 @@ include::blame-options.txt[]
 	is used for a caret to mark the boundary commit.
 
 
-THE DEFAULT FORMAT
-------------------
-
-When neither `--porcelain` nor `--incremental` option is specified,
-`git blame` will output annotation for each line with:
-
-- abbreviated object name for the commit the line came from;
-- author ident (by default author name and date, unless `-s` or `-e`
-  is specified); and
-- line number
-
-before the line contents.
-
 THE PORCELAIN FORMAT
 --------------------
 

Documentation/git-branch.txt

@@ -16,7 +16,7 @@ SYNOPSIS
 	[--points-at <object>] [--format=<format>]
 	[(-r | --remotes) | (-a | --all)]
 	[--list] [<pattern>...]
-'git branch' [--track [direct|inherit] | --no-track] [-f] <branchname> [<start-point>]
+'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]
 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
 'git branch' --unset-upstream [<branchname>]
 'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -118,21 +118,20 @@ 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, or whether it even
-	points to a valid commit. In combination with
+	branch irrespective of its merged status. In combination with
 	`-m` (or `--move`), allow renaming the branch even if the new
 	branch name already exists, the same applies for `-c` (or `--copy`).
 
 -m::
 --move::
-	Move/rename a branch, together with its config and reflog.
+	Move/rename a branch and the corresponding reflog.
 
 -M::
 	Shortcut for `--move --force`.
 
 -c::
 --copy::
-	Copy a branch, together with its config and reflog.
+	Copy a branch and the corresponding reflog.
 
 -C::
 	Shortcut for `--copy --force`.
@@ -206,34 +205,24 @@ This option is only applicable in non-verbose mode.
 	Display the full sha1s in the output listing rather than abbreviating them.
 
 -t::
---track [inherit|direct]::
+--track::
 	When creating a new branch, set up `branch.<name>.remote` and
-	`branch.<name>.merge` configuration entries to set "upstream" tracking
-	configuration for the new branch. This
+	`branch.<name>.merge` configuration entries to mark the
+	start-point branch as "upstream" from the new branch. This
 	configuration will tell git to show the relationship between the
 	two branches in `git status` and `git branch -v`. Furthermore,
 	it directs `git pull` without arguments to pull from the
 	upstream when the new branch is checked out.
 +
-The exact upstream branch is chosen depending on the optional argument:
-`--track` or `--track direct` means to use the start-point branch itself as the
-upstream; `--track inherit` means to copy the upstream configuration of the
-start-point branch.
-+
-`--track direct` is the default when the start point is a remote-tracking branch.
+This behavior is the default when the start point is a remote-tracking branch.
 Set the branch.autoSetupMerge configuration variable to `false` if you
 want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
 were given. Set it to `always` if you want this behavior when the
-start-point is either a local or remote-tracking branch. Set it to
-`inherit` if you want to copy the tracking configuration from the
-branch point.
-+
-See linkgit:git-pull[1] and linkgit:git-config[1] for additional discussion on
-how the `branch.<name>.remote` and `branch.<name>.merge` options are used.
+start-point is either a local or remote-tracking branch.
 
 --no-track::
 	Do not set up "upstream" configuration, even if the
-	branch.autoSetupMerge configuration variable is set.
+	branch.autoSetupMerge configuration variable is true.
 
 --set-upstream::
 	As this option had confusing syntax, it is no longer supported.

Documentation/git-bugreport.txt

@@ -40,8 +40,8 @@ OPTIONS
 -------
 -o <path>::
 --output-directory <path>::
-	Place the resulting bug report file in `<path>` instead of the current
-	directory.
+	Place the resulting bug report file in `<path>` instead of the root of
+	the Git repository.
 
 -s <format>::
 --suffix <format>::

Documentation/git-bundle.txt

@@ -13,53 +13,26 @@ SYNOPSIS
 		    [--version=<version>] <file> <git-rev-list-args>
 'git bundle' verify [-q | --quiet] <file>
 'git bundle' list-heads <file> [<refname>...]
-'git bundle' unbundle [--progress] <file> [<refname>...]
+'git bundle' unbundle <file> [<refname>...]
 
 DESCRIPTION
 -----------
 
-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.
+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.
 
-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.
+The 'git bundle' command packages objects and references in an archive
+at the originating machine, which can then be imported into another
+repository using 'git fetch', 'git pull', or 'git clone',
+after moving the archive by some means (e.g., by sneakernet).
 
-Git commands that fetch or otherwise "read" via protocols such as
-`ssh://` and `https://` can also operate on bundle files. It is
-possible linkgit:git-clone[1] a new repository from a bundle, to use
-linkgit:git-fetch[1] to fetch from one, and to list the references
-contained within it with linkgit:git-ls-remote[1]. There's no
-corresponding "write" support, i.e.a 'git push' into a bundle is not
-supported.
-
-See the "EXAMPLES" section below for examples of how to use bundles.
-
-BUNDLE FORMAT
--------------
-
-Bundles are `.pack` files (see linkgit:git-pack-objects[1]) with a
-header indicating what references are contained within the bundle.
-
-Like the the packed archive format itself bundles can either be
-self-contained, or be created using exclusions.
-See the "OBJECT PREREQUISITES" section below.
-
-Bundles created using revision exclusions are "thin packs" created
-using the `--thin` option to linkgit:git-pack-objects[1], and
-unbundled using the `--fix-thin` option to linkgit:git-index-pack[1].
-
-There is no option to create a "thick pack" when using revision
-exclusions, and users should not be concerned about the difference. By
-using "thin packs", bundles created using exclusions are smaller in
-size. That they're "thin" under the hood is merely noted here as a
-curiosity, and as a reference to other documentation.
-
-See link:technical/bundle-format.html[the `bundle-format`
-documentation] for more details and the discussion of "thin pack" in
-link:technical/pack-format.html[the pack format documentation] for
-further details.
+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.
 
 OPTIONS
 -------
@@ -144,88 +117,28 @@ unbundle <file>::
 SPECIFYING REFERENCES
 ---------------------
 
-Revisions must be accompanied by reference names to be packaged in a
-bundle.
-
-More than one reference may be packaged, and more than one set of prerequisite objects can
-be specified.  The objects packaged are those not contained in the
-union of the prerequisites.
-
-The 'git bundle create' command resolves the reference names for you
-using the same rules as `git rev-parse --abbrev-ref=loose`. Each
-prerequisite can be specified explicitly (e.g. `^master~10`), or implicitly
-(e.g. `master~10..master`, `--since=10.days.ago master`).
-
-All of these simple cases are OK (assuming we have a "master" and
-"next" branch):
-
-----------------
-$ git bundle create master.bundle master
-$ echo master | git bundle create master.bundle --stdin
-$ git bundle create master-and-next.bundle master next
-$ (echo master; echo next) | git bundle create master-and-next.bundle --stdin
-----------------
-
-And so are these (and the same but omitted `--stdin` examples):
-
-----------------
-$ git bundle create recent-master.bundle master~10..master
-$ git bundle create recent-updates.bundle master~10..master next~5..next
-----------------
-
-A revision name or a range whose right-hand-side cannot be resolved to
-a reference is not accepted:
-
-----------------
-$ git bundle create HEAD.bundle $(git rev-parse HEAD)
-fatal: Refusing to create empty bundle.
-$ git bundle create master-yesterday.bundle master~10..master~5
-fatal: Refusing to create empty bundle.
-----------------
-
-OBJECT PREREQUISITES
---------------------
-
-When creating bundles it is possible to create a self-contained bundle
-that can be unbundled in a repository with no common history, as well
-as providing negative revisions to exclude objects needed in the
-earlier parts of the history.
-
-Feeding a revision such as `new` to `git bundle create` will create a
-bundle file that contains all the objects reachable from the revision
-`new`. That bundle can be unbundled in any repository to obtain a full
-history that leads to the revision `new`:
-
-----------------
-$ git bundle create full.bundle new
-----------------
-
-A revision range such as `old..new` will produce a bundle file that
-will require the revision `old` (and any objects reachable from it)
-to exist for the bundle to be "unbundle"-able:
-
-----------------
-$ git bundle create full.bundle old..new
-----------------
-
-A self-contained bundle without any prerequisites can be extracted
-into anywhere, even into an empty repository, or be cloned from
-(i.e., `new`, but not `old..new`).
+'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`).
 
+It is very important that the basis used be held by the destination.
 It is okay to err on the side of caution, causing the bundle file
 to contain objects already in the destination, as these are ignored
 when unpacking at the destination.
 
+`git clone` can use any bundle created without negative refspecs
+(e.g., `new`, but not `old..new`).
 If you want to match `git clone --mirror`, which would include your
 refs such as `refs/remotes/*`, use `--all`.
 If you want to provide the same set of refs that a clone directly
 from the source repository would get, use `--branches --tags` for
 the `<git-rev-list-args>`.
 
-The 'git bundle verify' command can be used to check whether your
-recipient repository has the required prerequisite commits for a
-bundle.
-
 EXAMPLES
 --------
 
@@ -236,7 +149,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 prerequisites. You can use a tag to remember up to what commit you last
+any basis. 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:
 
@@ -287,7 +200,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
-prerequisites, giving a cut-off point to limit the revisions and objects that go
+basis, 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:
@@ -298,7 +211,7 @@ You can use a tag that is present in both:
 $ git bundle create mybundle v1.0.0..master
 ----------------
 
-You can use a prerequisite based on time:
+You can use a basis based on time:
 
 ----------------
 $ git bundle create mybundle --since=10.days master
@@ -311,7 +224,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 prerequisite:
+that was created with a basis:
 
 ----------------
 $ git bundle verify mybundle

Documentation/git-cat-file.txt

@@ -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.
 
@@ -94,10 +94,8 @@ OPTIONS
 	Instead of reading a list of objects on stdin, perform the
 	requested batch operation on all objects in the repository and
 	any alternate object stores (not just reachable objects).
-	Requires `--batch` or `--batch-check` be specified. By default,
-	the objects are visited in order sorted by their hashes; see
-	also `--unordered` below. Objects are presented as-is, without
-	respecting the "replace" mechanism of linkgit:git-replace[1].
+	Requires `--batch` or `--batch-check` be specified. Note that
+	the objects are visited in order sorted by their hashes.
 
 --buffer::
 	Normally batch output is flushed after each object is output, so
@@ -117,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.
 +
@@ -177,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
@@ -202,7 +200,7 @@ object, with placeholders of the form `%(atom)` expanded, followed by a
 newline. The available atoms are:
 
 `objectname`::
-	The full hex representation of the object name.
+	The 40-hex object name of the object.
 
 `objecttype`::
 	The type of the object (the same as `cat-file -t` reports).
@@ -217,9 +215,8 @@ newline. The available atoms are:
 
 `deltabase`::
 	If the object is stored as a delta on-disk, this expands to the
-	full hex representation of the delta base object name.
-	Otherwise, expands to the null OID (all zeroes). See `CAVEATS`
-	below.
+	40-hex sha1 of the delta base object. Otherwise, expands to the
+	null sha1 (40 zeroes). See `CAVEATS` below.
 
 `rest`::
 	If this atom is used in the output string, input lines are split
@@ -238,14 +235,14 @@ newline.
 For example, `--batch` without a custom format would produce:
 
 ------------
-<oid> SP <type> SP <size> LF
+<sha1> SP <type> SP <size> LF
 <contents> LF
 ------------
 
 Whereas `--batch-check='%(objectname) %(objecttype)'` would produce:
 
 ------------
-<oid> SP <type> LF
+<sha1> SP <type> LF
 ------------
 
 If a name is specified on stdin that cannot be resolved to an object in
@@ -261,7 +258,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:
 
@@ -270,11 +267,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:
 
 ------------

Documentation/git-checkout.txt

@@ -11,7 +11,7 @@ SYNOPSIS
 'git checkout' [-q] [-f] [-m] [<branch>]
 'git checkout' [-q] [-f] [-m] --detach [<branch>]
 'git checkout' [-q] [-f] [-m] [--detach] <commit>
-'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new-branch>] [<start-point>]
+'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <new_branch>] [<start_point>]
 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>...
 'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]
 'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]
@@ -43,7 +43,7 @@ You could omit `<branch>`, in which case the command degenerates to
 rather expensive side-effects to show only the tracking information,
 if exists, for the current branch.
 
-'git checkout' -b|-B <new-branch> [<start-point>]::
+'git checkout' -b|-B <new_branch> [<start point>]::
 
 	Specifying `-b` causes a new branch to be created as if
 	linkgit:git-branch[1] were called and then checked out.  In
@@ -52,11 +52,11 @@ if exists, for the current branch.
 	`--track` without `-b` implies branch creation; see the
 	description of `--track` below.
 +
-If `-B` is given, `<new-branch>` is created if it doesn't exist; otherwise, it
+If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it
 is reset. This is the transactional equivalent of
 +
 ------------
-$ git branch -f <branch> [<start-point>]
+$ git branch -f <branch> [<start point>]
 $ git checkout <branch>
 ------------
 +
@@ -118,9 +118,8 @@ OPTIONS
 -f::
 --force::
 	When switching branches, proceed even if the index or the
-	working tree differs from `HEAD`, and even if there are untracked
-	files in the way.  This is used to throw away local changes and
-	any untracked files or directories that are in the way.
+	working tree differs from `HEAD`.  This is used to throw away
+	local changes.
 +
 When checking out paths from the index, do not fail upon unmerged
 entries; instead, unmerged entries are ignored.
@@ -145,18 +144,18 @@ as `ours` (i.e. "our shared canonical history"), while what you did
 on your side branch as `theirs` (i.e. "one contributor's work on top
 of it").
 
--b <new-branch>::
-	Create a new branch named `<new-branch>` and start it at
-	`<start-point>`; see linkgit:git-branch[1] for details.
+-b <new_branch>::
+	Create a new branch named `<new_branch>` and start it at
+	`<start_point>`; see linkgit:git-branch[1] for details.
 
--B <new-branch>::
-	Creates the branch `<new-branch>` and start it at `<start-point>`;
-	if it already exists, then reset it to `<start-point>`. This is
+-B <new_branch>::
+	Creates the branch `<new_branch>` and start it at `<start_point>`;
+	if it already exists, then reset it to `<start_point>`. This is
 	equivalent to running "git branch" with "-f"; see
 	linkgit:git-branch[1] for details.
 
 -t::
---track [direct|inherit]::
+--track::
 	When creating a new branch, set up "upstream" configuration. See
 	"--track" in linkgit:git-branch[1] for details.
 +
@@ -210,16 +209,16 @@ variable.
 	`<commit>` is not a branch name.  See the "DETACHED HEAD" section
 	below for details.
 
---orphan <new-branch>::
-	Create a new 'orphan' branch, named `<new-branch>`, started from
-	`<start-point>` and switch to it.  The first commit made on this
+--orphan <new_branch>::
+	Create a new 'orphan' branch, named `<new_branch>`, started from
+	`<start_point>` and switch to it.  The first commit made on this
 	new branch will have no parents and it will be the root of a new
 	history totally disconnected from all the other branches and
 	commits.
 +
 The index and the working tree are adjusted as if you had previously run
-`git checkout <start-point>`.  This allows you to start a new history
-that records a set of paths similar to `<start-point>` by easily running
+`git checkout <start_point>`.  This allows you to start a new history
+that records a set of paths similar to `<start_point>` by easily running
 `git commit -a` to make the root commit.
 +
 This can be useful when you want to publish the tree from a commit
@@ -229,7 +228,7 @@ whose full history contains proprietary or otherwise encumbered bits of
 code.
 +
 If you want to start a disconnected history that records a set of paths
-that is totally different from the one of `<start-point>`, then you should
+that is totally different from the one of `<start_point>`, then you should
 clear the index and the working tree right after creating the orphan
 branch by running `git rm -rf .` from the top level of the working tree.
 Afterwards you will be ready to prepare your new files, repopulating the
@@ -266,7 +265,8 @@ When switching branches with `--merge`, staged changes may be lost.
 	The same as `--merge` option above, but changes the way the
 	conflicting hunks are presented, overriding the
 	`merge.conflictStyle` configuration variable.  Possible values are
-	"merge" (default), "diff3", and "zdiff3".
+	"merge" (default) and "diff3" (in addition to what is shown by
+	"merge" style, shows the original contents).
 
 -p::
 --patch::
@@ -340,10 +340,10 @@ As a special case, you may use `A...B` as a shortcut for the
 merge base of `A` and `B` if there is exactly one merge base. You can
 leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 
-<new-branch>::
+<new_branch>::
 	Name for the new branch.
 
-<start-point>::
+<start_point>::
 	The name of a commit at which to start the new branch; see
 	linkgit:git-branch[1] for details. Defaults to `HEAD`.
 +

Documentation/git-cherry-pick.txt

@@ -8,7 +8,7 @@ git-cherry-pick - Apply the changes introduced by some existing commits
 SYNOPSIS
 --------
 [verse]
-'git cherry-pick' [--edit] [-n] [-m <parent-number>] [-s] [-x] [--ff]
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
 		  [-S[<keyid>]] <commit>...
 'git cherry-pick' (--continue | --skip | --abort | --quit)
 
@@ -81,8 +81,8 @@ OPTIONS
 	described above, and `-r` was to disable it.  Now the
 	default is not to do `-x` so this option is a no-op.
 
--m <parent-number>::
---mainline <parent-number>::
+-m parent-number::
+--mainline parent-number::
 	Usually you cannot cherry-pick a merge because you do not know which
 	side of the merge should be considered the mainline.  This
 	option specifies the parent number (starting from 1) of

Documentation/git-clone.txt

@@ -9,13 +9,13 @@ git-clone - Clone a repository into a new directory
 SYNOPSIS
 --------
 [verse]
-'git clone' [--template=<template-directory>]
+'git clone' [--template=<template_directory>]
 	  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
 	  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
-	  [--dissociate] [--separate-git-dir <git-dir>]
+	  [--dissociate] [--separate-git-dir <git dir>]
 	  [--depth <depth>] [--[no-]single-branch] [--no-tags]
 	  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
-	  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
+	  [--[no-]remote-submodules] [--jobs <n>] [--sparse]
 	  [--filter=<filter>] [--] <repository>
 	  [<directory>]
 
@@ -149,11 +149,6 @@ 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
@@ -167,10 +162,10 @@ objects from the source repository into a pack in the cloned repository.
 	configuration variables are created.
 
 --sparse::
-	Employ a sparse-checkout, with only files in the toplevel
-	directory initially being present.  The
-	linkgit:git-sparse-checkout[1] command can be used to grow the
-	working directory as needed.
+	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
@@ -211,7 +206,7 @@ objects from the source repository into a pack in the cloned repository.
 	via ssh, this specifies a non-default path for the command
 	run on the other end.
 
---template=<template-directory>::
+--template=<template_directory>::
 	Specify the directory from which templates will be used;
 	(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
 
@@ -294,7 +289,7 @@ or `--mirror` is given)
 	superproject's recorded SHA-1. Equivalent to passing `--remote` to
 	`git submodule update`.
 
---separate-git-dir=<git-dir>::
+--separate-git-dir=<git dir>::
 	Instead of placing the cloned repository where it is supposed
 	to be, place the cloned repository at the specified directory,
 	then make a filesystem-agnostic Git symbolic link to there.

Documentation/git-column.txt

@@ -39,7 +39,7 @@ OPTIONS
 --indent=<string>::
 	String to be printed at the beginning of each line.
 
---nl=<string>::
+--nl=<N>::
 	String to be printed at the end of each line,
 	including newline character.
 

Documentation/git-commit.txt

@@ -9,13 +9,12 @@ SYNOPSIS
 --------
 [verse]
 'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
-	   [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
+	   [--dry-run] [(-c | -C | --fixup | --squash) <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] [--pathspec-from-file=<file> [--pathspec-file-nul]]
-	   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]
-	   [--] [<pathspec>...]
+	   [-S[<keyid>]] [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -72,7 +71,7 @@ OPTIONS
 
 -p::
 --patch::
-	Use the interactive patch selection interface to choose
+	Use the interactive patch selection interface to chose
 	which changes to commit. See linkgit:git-add[1] for
 	details.
 
@@ -87,44 +86,11 @@ OPTIONS
 	Like '-C', but with `-c` the editor is invoked, so that
 	the user can further edit the commit message.
 
---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.
+--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.
 
 --squash=<commit>::
 	Construct a commit message for use with `rebase --autosquash`.
@@ -200,21 +166,9 @@ The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`.
 
 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::
-	By default, the pre-commit and commit-msg hooks are run.
-	When any of `--no-verify` or `-n` is given, these are bypassed.
+--no-verify::
+	This option bypasses the pre-commit and commit-msg hooks.
 	See also linkgit:githooks[5].
 
 --allow-empty::

Documentation/git-config.txt

@@ -9,20 +9,20 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]
-'git config' [<file-option>] [--type=<type>] --add <name> <value>
-'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>
-'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]
-'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]
-'git config' [<file-option>] --rename-section <old-name> <new-name>
-'git config' [<file-option>] --remove-section <name>
+'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]
+'git config' [<file-option>] [--type=<type>] --add name value
+'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all name value [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]
+'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL
+'git config' [<file-option>] [--fixed-value] --unset name [value-pattern]
+'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]
+'git config' [<file-option>] --rename-section old_name new_name
+'git config' [<file-option>] --remove-section name
 'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
-'git config' [<file-option>] --get-color <name> [<default>]
-'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]
+'git config' [<file-option>] --get-color name [default]
+'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
 'git config' [<file-option>] -e | --edit
 
 DESCRIPTION
@@ -71,10 +71,6 @@ codes are:
 
 On success, the command returns the exit code 0.
 
-A list of all available configuration variables can be obtained using the
-`git help --config` command.
-
-[[OPTIONS]]
 OPTIONS
 -------
 
@@ -102,9 +98,9 @@ OPTIONS
 	in which section and variable names are lowercased, but subsection
 	names are not.
 
---get-urlmatch <name> <URL>::
+--get-urlmatch name URL::
 	When given a two-part name section.key, the value for
-	section.<URL>.key whose <URL> part matches the best to the
+	section.<url>.key whose <url> part matches the best to the
 	given URL is returned (if no such key exists, the value for
 	section.key is used as a fallback).  When given just the
 	section as name, do so for all the keys in the section and
@@ -145,17 +141,11 @@ See also <<FILES>>.
 	read from or written to if `extensions.worktreeConfig` is
 	present. If not it's the same as `--local`.
 
--f <config-file>::
---file <config-file>::
-	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>>.
+-f config-file::
+--file config-file::
+	Use the given config file instead of the one specified by GIT_CONFIG.
 
---blob <blob>::
+--blob blob::
 	Similar to `--file` but use the given blob instead of a file. E.g.
 	you can use 'master:.gitmodules' to read values from the file
 	'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
@@ -246,18 +236,18 @@ Valid `<type>`'s include:
 	all queried config options with the scope of that value
 	(local, global, system, command).
 
---get-colorbool <name> [<stdout-is-tty>]::
+--get-colorbool name [stdout-is-tty]::
 
-	Find the color setting for `<name>` (e.g. `color.diff`) and output
-	"true" or "false".  `<stdout-is-tty>` should be either "true" or
+	Find the color setting for `name` (e.g. `color.diff`) and output
+	"true" or "false".  `stdout-is-tty` should be either "true" or
 	"false", and is taken into account when configuration says
-	"auto".  If `<stdout-is-tty>` is missing, then checks the standard
+	"auto".  If `stdout-is-tty` is missing, then checks the standard
 	output of the command itself, and exits with status 0 if color
 	is to be used, or exits with status 1 otherwise.
 	When the color setting for `name` is undefined, the command uses
 	`color.ui` as fallback.
 
---get-color <name> [<default>]::
+--get-color name [default]::
 
 	Find the color configured for `name` (e.g. `color.diff.new`) and
 	output it as the ANSI color escape sequence to the standard
@@ -335,18 +325,20 @@ 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 using the `--global`, `--system`,
-`--local`, `--worktree`, and `--file` command-line options; see
-<<OPTIONS>> above.
+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.
 
 
 ENVIRONMENT
 -----------
 
-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::
+	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_NOSYSTEM::
 	Whether to skip reading settings from the system-wide
@@ -370,12 +362,6 @@ 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

Documentation/git-credential.txt

@@ -8,7 +8,7 @@ git-credential - Retrieve and store user credentials
 SYNOPSIS
 --------
 ------------------
-'git credential' (fill|approve|reject)
+git credential <fill|approve|reject>
 ------------------
 
 DESCRIPTION
@@ -159,7 +159,3 @@ 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

Documentation/git-cvsexportcommit.txt

@@ -9,8 +9,8 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
 SYNOPSIS
 --------
 [verse]
-'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d <cvsroot>]
-	[-w <cvs-workdir>] [-W] [-f] [-m <msgprefix>] [<parent-commit>] <commit-id>
+'git cvsexportcommit' [-h] [-u] [-v] [-c] [-P] [-p] [-a] [-d cvsroot]
+	[-w cvsworkdir] [-W] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
 
 
 DESCRIPTION

Documentation/git-cvsimport.txt

@@ -11,9 +11,9 @@ SYNOPSIS
 [verse]
 'git cvsimport' [-o <branch-for-HEAD>] [-h] [-v] [-d <CVSROOT>]
 	      [-A <author-conv-file>] [-p <options-for-cvsps>] [-P <file>]
-	      [-C <git-repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
-	      [-a] [-m] [-M <regex>] [-S <regex>] [-L <commit-limit>]
-	      [-r <remote>] [-R] [<CVS-module>]
+	      [-C <git_repository>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]
+	      [-a] [-m] [-M <regex>] [-S <regex>] [-L <commitlimit>]
+	      [-r <remote>] [-R] [<CVS_module>]
 
 
 DESCRIPTION
@@ -59,7 +59,7 @@ OPTIONS
 	from `CVS/Root`. If no such file exists, it checks for the
 	`CVSROOT` environment variable.
 
-<CVS-module>::
+<CVS_module>::
 	The CVS module you want to import. Relative to <CVSROOT>.
 	If not given, 'git cvsimport' tries to read it from
 	`CVS/Repository`.

Documentation/git-cvsserver.txt

@@ -24,18 +24,6 @@ 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
 -------
 
@@ -69,6 +57,18 @@ 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
 -----------
 
@@ -99,7 +99,7 @@ looks like
 
 ------
 
-Only anonymous access is provided by pserver by default. To commit you
+Only anonymous access is provided by pserve by default. To commit you
 will have to create pserver accounts, simply add a gitcvs.authdb
 setting in the config file of the repositories you want the cvsserver
 to allow writes to, for example:
@@ -114,20 +114,21 @@ The format of these files is username followed by the encrypted password,
 for example:
 
 ------
-   myuser:sqkNi8zPf01HI
-   myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/
-   myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3
+   myuser:$1Oyx5r9mdGZ2
+   myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./
 ------
 You can use the 'htpasswd' facility that comes with Apache to make these
-files, but only with the -d option (or -B if your system suports it).
+files, but Apache's MD5 crypt method differs from the one used by most C
+library's crypt() function, so don't use the -m option.
 
-Preferably use the system specific utility that manages password hash
-creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or
-pwhash in NetBSD) and paste it in the right location.
+Alternatively you can produce the password with perl's crypt() operator:
+-----
+   perl -e 'my ($user, $pass) = @ARGV; printf "%s:%s\n", $user, crypt($user, $pass)' $USER password
+-----
 
 Then provide your password via the pserver method, for example:
 ------
-   cvs -d:pserver:someuser:somepassword@server:/path/repo.git co <HEAD_name>
+   cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>
 ------
 No special setup is needed for SSH access, other than having Git tools
 in the PATH. If you have clients that do not accept the CVS_SERVER
@@ -137,7 +138,7 @@ Note: Newer CVS versions (>= 1.12.11) also support specifying
 CVS_SERVER directly in CVSROOT like
 
 ------
-   cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
+cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
 ------
 This has the advantage that it will be saved in your 'CVS/Root' files and
 you don't need to worry about always setting the correct environment
@@ -185,8 +186,8 @@ allowing access over SSH.
 +
 --
 ------
-   export CVSROOT=:ext:user@server:/var/git/project.git
-   export CVS_SERVER="git cvsserver"
+     export CVSROOT=:ext:user@server:/var/git/project.git
+     export CVS_SERVER="git cvsserver"
 ------
 --
 4. For SSH clients that will make commits, make sure their server-side
@@ -202,7 +203,7 @@ allowing access over SSH.
    `project-master` directory:
 +
 ------
-   cvs co -d project-master master
+     cvs co -d project-master master
 ------
 
 [[dbbackend]]

Documentation/git-describe.txt

@@ -63,10 +63,9 @@ OPTIONS
 	Automatically implies --tags.
 
 --abbrev=<n>::
-	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
+	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
 	will suppress long format, only showing the closest tag.
 
 --candidates=<n>::
@@ -140,11 +139,8 @@ 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" + 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 hash suffix is "-g" + unambiguous abbreviation for the tip commit
+of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`).
 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.

Documentation/git-diff-files.txt

@@ -9,7 +9,7 @@ git-diff-files - Compares files in the working tree and the index
 SYNOPSIS
 --------
 [verse]
-'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common-diff-options>] [<path>...]
+'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
 
 DESCRIPTION
 -----------

Documentation/git-diff-index.txt

@@ -9,7 +9,7 @@ git-diff-index - Compare a tree to the working tree or index
 SYNOPSIS
 --------
 [verse]
-'git diff-index' [-m] [--cached] [--merge-base] [<common-diff-options>] <tree-ish> [<path>...]
+'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]
 
 DESCRIPTION
 -----------

Documentation/git-diff-tree.txt

@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
 	      [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
-	      [<common-diff-options>] <tree-ish> [<tree-ish>] [<path>...]
+	      [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
 
 DESCRIPTION
 -----------

Documentation/git-diff.txt

@@ -51,20 +51,16 @@ files on disk.
 	--staged is a synonym of --cached.
 +
 If --merge-base is given, instead of using <commit>, use the merge base
-of <commit> and HEAD.  `git diff --cached --merge-base A` is equivalent to
-`git diff --cached $(git merge-base A HEAD)`.
+of <commit> and HEAD.  `git diff --merge-base A` is equivalent to
+`git diff $(git merge-base A HEAD)`.
 
-'git diff' [<options>] [--merge-base] <commit> [--] [<path>...]::
+'git diff' [<options>] <commit> [--] [<path>...]::
 
 	This form is to view the changes you have in your
 	working tree relative to the named <commit>.  You can
 	use HEAD to compare it with the latest commit, or a
 	branch name to compare with the tip of a different
 	branch.
-+
-If --merge-base is given, instead of using <commit>, use the merge base
-of <commit> and HEAD.  `git diff --merge-base A` is equivalent to
-`git diff $(git merge-base A HEAD)`.
 
 'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]::
 

Documentation/git-fetch.txt

@@ -133,7 +133,7 @@ remember to run that, set `fetch.prune` globally, or
 linkgit:git-config[1].
 
 Here's where things get tricky and more specific. The pruning feature
-doesn't actually care about branches, instead it'll prune local <-->
+doesn't actually care about branches, instead it'll prune local <->
 remote-references as a function of the refspec of the remote (see
 `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above).
 

Documentation/git-fmt-merge-msg.txt

@@ -9,7 +9,7 @@ git-fmt-merge-msg - Produce a merge commit message
 SYNOPSIS
 --------
 [verse]
-'git fmt-merge-msg' [-m <message>] [--into-name <branch>] [--log[=<n>] | --no-log]
+'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log]
 'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file>
 
 DESCRIPTION
@@ -44,10 +44,6 @@ OPTIONS
 	Use <message> instead of the branch names for the first line
 	of the log message.  For use with `--log`.
 
---into-name <branch>::
-	Prepare the merge message as if merging to the branch `<branch>`,
-	instead of the name of the real branch to which the merge is made.
-
 -F <file>::
 --file <file>::
 	Take the list of merged objects from <file> instead of

Documentation/git-for-each-ref.txt

@@ -235,15 +235,6 @@ and `date` to extract the named component.  For email fields (`authoremail`,
 without angle brackets, and `:localpart` to get the part before the `@` symbol
 out of the trimmed email.
 
-The raw data in an object is `raw`.
-
-raw:size::
-	The raw data size of the object.
-
-Note that `--format=%(raw)` can not be used with `--python`, `--shell`, `--tcl`,
-because such language may not support arbitrary binary data in their string
-variable type.
-
 The message in a commit or a tag object is `contents`, from which
 `contents:<part>` can be used to extract various parts out of:
 

Documentation/git-format-patch.txt

@@ -18,7 +18,7 @@ SYNOPSIS
 		   [-n | --numbered | -N | --no-numbered]
 		   [--start-number <n>] [--numbered-files]
 		   [--in-reply-to=<message id>] [--suffix=.<sfx>]
-		   [--ignore-if-in-upstream] [--always]
+		   [--ignore-if-in-upstream]
 		   [--cover-from-description=<mode>]
 		   [--rfc] [--subject-prefix=<subject prefix>]
 		   [(--reroll-count|-v) <n>]
@@ -36,28 +36,11 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Prepare each non-merge commit with its "patch" in
-one "message" per commit, formatted to resemble a UNIX mailbox.
+Prepare each commit with its patch in
+one file per commit, formatted to resemble UNIX mailbox format.
 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
@@ -192,10 +175,6 @@ will want to ensure that threading is disabled for `git send-email`.
 	patches being generated, and any patch that matches is
 	ignored.
 
---always::
-	Include patches for commits that do not introduce any change,
-	which are omitted by default.
-
 --cover-from-description=<mode>::
 	Controls which parts of the cover letter will be automatically
 	populated using the branch's description.
@@ -242,11 +221,6 @@ populated with placeholder text.
 	`--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
@@ -693,10 +667,10 @@ You can also use `git format-patch --base=P -3 C` to generate patches
 for A, B and C, and the identifiers for P, X, Y, Z are appended at the
 end of the first message.
 
-If set `--base=auto` in cmdline, it will automatically compute
-the base commit as the merge base of tip commit of the remote-tracking
+If set `--base=auto` in cmdline, it will track base commit automatically,
+the base commit will be the merge base of tip commit of the remote-tracking
 branch and revision-range specified in cmdline.
-For a local branch, you need to make it to track a remote branch by `git branch
+For a local branch, you need to track a remote branch by `git branch
 --set-upstream-to` before using this option.
 
 EXAMPLES
@@ -744,14 +718,6 @@ 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]

Documentation/git-fsck.txt

@@ -12,7 +12,7 @@ SYNOPSIS
 'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
 	 [--[no-]full] [--strict] [--verbose] [--lost-found]
 	 [--[no-]dangling] [--[no-]progress] [--connectivity-only]
-	 [--[no-]name-objects] [<object>...]
+	 [--[no-]name-objects] [<object>*]
 
 DESCRIPTION
 -----------

Documentation/git-grep.txt

@@ -38,6 +38,38 @@ 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), 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.
+
+
 OPTIONS
 -------
 --cached::
@@ -331,38 +363,6 @@ 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

Documentation/git-gui.txt

@@ -8,7 +8,7 @@ git-gui - A portable graphical interface to Git
 SYNOPSIS
 --------
 [verse]
-'git gui' [<command>] [<arguments>]
+'git gui' [<command>] [arguments]
 
 DESCRIPTION
 -----------

Documentation/git-help.txt

@@ -8,15 +8,13 @@ git-help - Display help information about Git
 SYNOPSIS
 --------
 [verse]
-'git help' [-a|--all [--[no-]verbose]]
-	   [[-i|--info] [-m|--man] [-w|--web]] [<command>|<guide>]
-'git help' [-g|--guides]
-'git help' [-c|--config]
+'git help' [-a|--all [--[no-]verbose]] [-g|--guides]
+	   [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
 
 DESCRIPTION
 -----------
 
-With no options and no '<command>' or '<guide>' given, the synopsis of the 'git'
+With no options and no COMMAND or GUIDE given, the synopsis of the 'git'
 command and a list of the most commonly used Git commands are printed
 on the standard output.
 
@@ -33,7 +31,7 @@ variables.
 
 If an alias is given, git shows the definition of the alias on
 standard output. To get the manual page for the aliased command, use
-`git <command> --help`.
+`git COMMAND --help`.
 
 Note that `git --help ...` is identical to `git help ...` because the
 former is internally converted into the latter.
@@ -60,7 +58,8 @@ OPTIONS
 
 -g::
 --guides::
-	Prints a list of the Git concept guides on the standard output.
+	Prints a list of the Git concept guides on the standard output. This
+	option overrides any given command or guide name.
 
 -i::
 --info::

Documentation/git-http-backend.txt

@@ -16,9 +16,7 @@ A simple CGI program to serve the contents of a Git repository to Git
 clients accessing the repository over http:// and https:// protocols.
 The program supports clients fetching using both the smart HTTP protocol
 and the backwards-compatible dumb HTTP protocol, as well as clients
-pushing using the smart HTTP protocol. It also supports Git's
-more-efficient "v2" protocol if properly configured; see the
-discussion of `GIT_PROTOCOL` in the ENVIRONMENT section below.
+pushing using the smart HTTP protocol.
 
 It verifies that the directory has the magic file
 "git-daemon-export-ok", and it will refuse to export any Git directory
@@ -79,18 +77,6 @@ Apache 2.x::
 SetEnv GIT_PROJECT_ROOT /var/www/git
 SetEnv GIT_HTTP_EXPORT_ALL
 ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
-
-# This is not strictly necessary using Apache and a modern version of
-# git-http-backend, as the webserver will pass along the header in the
-# environment as HTTP_GIT_PROTOCOL, and http-backend will copy that into
-# GIT_PROTOCOL. But you may need this line (or something similar if you
-# are using a different webserver), or if you want to support older Git
-# versions that did not do that copying.
-#
-# Having the webserver set up GIT_PROTOCOL is perfectly fine even with
-# modern versions (and will take precedence over HTTP_GIT_PROTOCOL,
-# which means it can be used to override the client's request).
-SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
 ----------------------------------------------------------------
 +
 To enable anonymous read access but authenticated write access,
@@ -278,16 +264,6 @@ a repository with an extremely large number of refs.  The value can be
 specified with a unit (e.g., `100M` for 100 megabytes). The default is
 10 megabytes.
 
-Clients may probe for optional protocol capabilities (like the v2
-protocol) using the `Git-Protocol` HTTP header. In order to support
-these, the contents of that header must appear in the `GIT_PROTOCOL`
-environment variable. Most webservers will pass this header to the CGI
-via the `HTTP_GIT_PROTOCOL` variable, and `git-http-backend` will
-automatically copy that to `GIT_PROTOCOL`. However, some webservers may
-be more selective about which headers they'll pass, in which case they
-need to be configured explicitly (see the mention of `Git-Protocol` in
-the Apache config from the earlier EXAMPLES section).
-
 The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and
 GIT_COMMITTER_EMAIL to '$\{REMOTE_USER}@http.$\{REMOTE_ADDR\}',
 ensuring that any reflogs created by 'git-receive-pack' contain some

Documentation/git-http-fetch.txt

@@ -9,7 +9,7 @@ git-http-fetch - Download from a remote Git repository via HTTP
 SYNOPSIS
 --------
 [verse]
-'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w <filename>] [--recover] [--stdin | --packfile=<hash> | <commit>] <URL>
+'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>
 
 DESCRIPTION
 -----------

Documentation/git-http-push.txt

@@ -9,7 +9,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
 SYNOPSIS
 --------
 [verse]
-'git http-push' [--all] [--dry-run] [--force] [--verbose] <URL> <ref> [<ref>...]
+'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]
 
 DESCRIPTION
 -----------
@@ -63,15 +63,16 @@ of such patterns separated by a colon ":" (this means that a ref name
 cannot have a colon in it).  A single pattern '<name>' is just a
 shorthand for '<name>:<name>'.
 
-Each pattern pair '<src>:<dst>' consists of the source side (before
-the colon) and the destination side (after the colon).  The ref to be
-pushed is determined by finding a match that matches the source side,
-and where it is pushed is determined by using the destination side.
+Each pattern pair consists of the source side (before the colon)
+and the destination side (after the colon).  The ref to be
+pushed is determined by finding a match that matches the source
+side, and where it is pushed is determined by using the
+destination side.
 
- - It is an error if '<src>' does not match exactly one of the
+ - It is an error if <src> does not match exactly one of the
    local refs.
 
- - If '<dst>' does not match any remote ref, either
+ - If <dst> does not match any remote ref, either
 
    * it has to start with "refs/"; <dst> is used as the
      destination literally in this case.

Documentation/git-index-pack.txt

@@ -82,12 +82,6 @@ OPTIONS
 --strict::
 	Die, if the pack contains broken objects or links.
 
---progress-title::
-	For internal use only.
-+
-Set the title of the progress bar. The title is "Receiving objects" by
-default and "Indexing objects" when `--stdin` is specified.
-
 --check-self-contained-and-connected::
 	Die if the pack contains broken links. For internal use only.
 

Documentation/git-init-db.txt

@@ -9,7 +9,7 @@ git-init-db - Creates an empty Git repository
 SYNOPSIS
 --------
 [verse]
-'git init-db' [-q | --quiet] [--bare] [--template=<template-directory>] [--separate-git-dir <git-dir>] [--shared[=<permissions>]]
+'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]
 
 
 DESCRIPTION

Documentation/git-init.txt

@@ -9,10 +9,10 @@ git-init - Create an empty Git repository or reinitialize an existing one
 SYNOPSIS
 --------
 [verse]
-'git init' [-q | --quiet] [--bare] [--template=<template-directory>]
-	  [--separate-git-dir <git-dir>] [--object-format=<format>]
+'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
+	  [--separate-git-dir <git dir>] [--object-format=<format>]
 	  [-b <branch-name> | --initial-branch=<branch-name>]
-	  [--shared[=<permissions>]] [<directory>]
+	  [--shared[=<permissions>]] [directory]
 
 
 DESCRIPTION
@@ -57,12 +57,12 @@ values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default.
 +
 include::object-format-disclaimer.txt[]
 
---template=<template-directory>::
+--template=<template_directory>::
 
 Specify the directory from which templates will be used.  (See the "TEMPLATE
 DIRECTORY" section below.)
 
---separate-git-dir=<git-dir>::
+--separate-git-dir=<git dir>::
 
 Instead of initializing the repository as a directory to either `$GIT_DIR` or
 `./.git/`, create a text file there containing the path to the actual
@@ -79,7 +79,7 @@ repository.  If not specified, fall back to the default name (currently
 `master`, but this is subject to change in the future; the name can be
 customized via the `init.defaultBranch` configuration variable).
 
---shared[=(false|true|umask|group|all|world|everybody|<perm>)]::
+--shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
 
 Specify that the Git repository is to be shared amongst several users.  This
 allows users belonging to the same group to push into that
@@ -110,16 +110,13 @@ the repository permissions.
 
 Same as 'group', but make the repository readable by all users.
 
-'<perm>'::
+'0xxx'::
 
-'<perm>' is a 3-digit octal number prefixed with `0` and each file
-will have mode '<perm>'. '<perm>' will override users' umask(2)
-value (and not only loosen permissions as 'group' and 'all'
-does). '0640' will create a repository which is group-readable, but
-not group-writable or accessible to others. '0660' will create a repo
-that is readable and writable to the current user and group, but
-inaccessible to others (directories and executable files get their
-`x` bit from the `r` bit for corresponding classes of users).
+'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will
+override users' umask(2) value (and not only loosen permissions as 'group' and
+'all' does). '0640' will create a repository which is group-readable, but not
+group-writable or accessible to others. '0660' will create a repo that is
+readable and writable to the current user and group, but inaccessible to others.
 --
 
 By default, the configuration flag `receive.denyNonFastForwards` is enabled