Git 2.36.5

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

.cirrus.yml

@@ -9,7 +9,7 @@ freebsd_12_task:
     DEFAULT_TEST_TARGET: prove
     DEVELOPER: 1
   freebsd_instance:
-    image_family: freebsd-12-3
+    image_family: freebsd-12-2
     memory: 2G
   install_script:
     pkg install -y gettext gmake perl5

.github/workflows/l10n.yml

@@ -23,8 +23,8 @@ jobs:
             base=${{ github.event.before }}
             head=${{ github.event.after }}
           fi
-          echo base=$base >>$GITHUB_OUTPUT
-          echo head=$head >>$GITHUB_OUTPUT
+          echo "::set-output name=base::$base"
+          echo "::set-output name=head::$head"
       - name: Run partial clone
         run: |
           git -c init.defaultBranch=master init --bare .

.github/workflows/main.yml

@@ -34,17 +34,17 @@ jobs:
           then
             enabled=no
           fi
-          echo "enabled=$enabled" >>$GITHUB_OUTPUT
+          echo "::set-output name=enabled::$enabled"
       - name: skip if the commit or tree was already tested
         id: skip-if-redundant
-        uses: actions/github-script@v6
+        uses: actions/github-script@v3
         if: steps.check-ref.outputs.enabled == 'yes'
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             try {
               // Figure out workflow ID, commit and tree
-              const { data: run } = await github.rest.actions.getWorkflowRun({
+              const { data: run } = await github.actions.getWorkflowRun({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 run_id: context.runId,
@@ -54,7 +54,7 @@ jobs:
               const tree_id = run.head_commit.tree_id;
 
               // See whether there is a successful run for that commit or tree
-              const { data: runs } = await github.rest.actions.listWorkflowRuns({
+              const { data: runs } = await github.actions.listWorkflowRuns({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 per_page: 500,
@@ -83,7 +83,7 @@ jobs:
     if: needs.ci-config.outputs.enabled == 'yes'
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - uses: git-for-windows/setup-git-for-windows-sdk@v1
     - name: build
       shell: bash
@@ -94,7 +94,7 @@ jobs:
     - 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@v3
+      uses: actions/upload-artifact@v2
       with:
         name: windows-artifacts
         path: artifacts
@@ -108,7 +108,7 @@ jobs:
         nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
     steps:
     - name: download tracked files and build artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v2
       with:
         name: windows-artifacts
         path: ${{github.workspace}}
@@ -119,13 +119,13 @@ jobs:
     - name: test
       shell: bash
       run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
-    - name: print test failures
-      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+    - name: ci/print-test-failures.sh
+      if: failure()
       shell: bash
       run: ci/print-test-failures.sh
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -138,10 +138,10 @@ jobs:
       GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - uses: git-for-windows/setup-git-for-windows-sdk@v1
     - name: initialize vcpkg
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: 'microsoft/vcpkg'
         path: 'compat/vcbuild/vcpkg'
@@ -177,7 +177,7 @@ jobs:
     - 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@v3
+      uses: actions/upload-artifact@v2
       with:
         name: vs-artifacts
         path: artifacts
@@ -192,7 +192,7 @@ jobs:
     steps:
     - uses: git-for-windows/setup-git-for-windows-sdk@v1
     - name: download tracked files and build artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v2
       with:
         name: vs-artifacts
         path: ${{github.workspace}}
@@ -204,13 +204,13 @@ jobs:
       env:
         NO_SVN_TESTS: 1
       run: . /etc/profile && ci/run-test-slice.sh ${{matrix.nr}} 10
-    - name: print test failures
-      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+    - name: ci/print-test-failures.sh
+      if: failure()
       shell: bash
       run: ci/print-test-failures.sh
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -227,34 +227,30 @@ jobs:
             pool: ubuntu-latest
           - jobname: linux-sha256
             cc: clang
+            os: ubuntu
             pool: ubuntu-latest
           - jobname: linux-gcc
             cc: gcc
             cc_package: gcc-8
-            pool: ubuntu-20.04
+            pool: ubuntu-latest
           - jobname: linux-TEST-vars
             cc: gcc
+            os: ubuntu
             cc_package: gcc-8
-            pool: ubuntu-20.04
+            pool: ubuntu-latest
           - jobname: osx-clang
             cc: clang
-            pool: macos-12
+            pool: macos-latest
           - jobname: osx-gcc
             cc: gcc
             cc_package: gcc-9
-            pool: macos-12
+            pool: macos-latest
           - jobname: linux-gcc-default
             cc: gcc
             pool: ubuntu-latest
           - jobname: linux-leaks
             cc: gcc
             pool: ubuntu-latest
-          - jobname: linux-asan
-            cc: gcc
-            pool: ubuntu-latest
-          - jobname: linux-ubsan
-            cc: gcc
-            pool: ubuntu-latest
     env:
       CC: ${{matrix.vector.cc}}
       CC_PACKAGE: ${{matrix.vector.cc_package}}
@@ -262,14 +258,14 @@ jobs:
       runs_on_pool: ${{matrix.vector.pool}}
     runs-on: ${{matrix.vector.pool}}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - run: ci/install-dependencies.sh
     - run: ci/run-build-and-tests.sh
     - run: ci/print-test-failures.sh
-      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+      if: failure()
     - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -284,6 +280,7 @@ jobs:
         - jobname: linux-musl
           image: alpine
         - jobname: linux32
+          os: ubuntu32
           image: daald/ubuntu32:xenial
         - jobname: pedantic
           image: fedora
@@ -292,22 +289,13 @@ jobs:
     runs-on: ubuntu-latest
     container: ${{matrix.vector.image}}
     steps:
-    - uses: actions/checkout@v3
-      if: matrix.vector.jobname != 'linux32'
     - uses: actions/checkout@v1
-      if: matrix.vector.jobname == 'linux32'
     - run: ci/install-docker-dependencies.sh
     - run: ci/run-build-and-tests.sh
     - run: ci/print-test-failures.sh
+      if: failure()
+    - name: Upload failed tests' directories
       if: failure() && env.FAILED_TEST_ARTIFACTS != ''
-    - name: Upload failed tests' directories
-      if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname != 'linux32'
-      uses: actions/upload-artifact@v3
-      with:
-        name: failed-tests-${{matrix.vector.jobname}}
-        path: ${{env.FAILED_TEST_ARTIFACTS}}
-    - name: Upload failed tests' directories
-      if: failure() && env.FAILED_TEST_ARTIFACTS != '' && matrix.vector.jobname == 'linux32'
       uses: actions/upload-artifact@v1
       with:
         name: failed-tests-${{matrix.vector.jobname}}
@@ -317,9 +305,9 @@ jobs:
     if: needs.ci-config.outputs.enabled == 'yes'
     env:
       jobname: StaticAnalysis
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - run: ci/install-dependencies.sh
     - run: ci/run-static-analysis.sh
     - run: ci/check-directional-formatting.bash
@@ -339,7 +327,7 @@ jobs:
         artifact: sparse-20.04
     - name: Install the current `sparse` package
       run: sudo dpkg -i sparse-20.04/sparse_*.deb
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Install other dependencies
       run: ci/install-dependencies.sh
     - run: make sparse
@@ -351,6 +339,6 @@ jobs:
       jobname: Documentation
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - run: ci/install-dependencies.sh
     - run: ci/test-documentation.sh

.gitignore

@@ -1,5 +1,7 @@
+/fuzz-commit-graph
 /fuzz_corpora
-/GIT-BUILD-DIR
+/fuzz-pack-headers
+/fuzz-pack-idx
 /GIT-BUILD-OPTIONS
 /GIT-CFLAGS
 /GIT-LDFLAGS
@@ -8,7 +10,6 @@
 /GIT-PERL-HEADER
 /GIT-PYTHON-VARS
 /GIT-SCRIPT-DEFINES
-/GIT-SPATCH-DEFINES
 /GIT-USER-AGENT
 /GIT-VERSION-FILE
 /bin-wrappers/
@@ -52,7 +53,6 @@
 /git-cvsimport
 /git-cvsserver
 /git-daemon
-/git-diagnose
 /git-diff
 /git-diff-files
 /git-diff-index
@@ -180,14 +180,11 @@
 /git-verify-commit
 /git-verify-pack
 /git-verify-tag
-/git-version
 /git-web--browse
 /git-whatchanged
 /git-worktree
 /git-write-tree
-/scalar
 /git-core-*/?*
-/git.res
 /gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
 /gitweb/static/gitweb.js
@@ -203,7 +200,6 @@
 *.[aos]
 *.o.json
 *.py[co]
-.build/
 .depend/
 *.gcda
 *.gcno
@@ -228,6 +224,7 @@
 *.hcc
 *.obj
 *.lib
+*.res
 *.sln
 *.sp
 *.suo

.mailmap

@@ -165,7 +165,6 @@ Mark Rada <marada@uwaterloo.ca>
 Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
 Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
 Masaya Suzuki <masayasuzuki@google.com> <draftcode@gmail.com>
-Matheus Tavares <matheus.tavb@gmail.com> <matheus.bernardino@usp.br>
 Matt Draisey <matt@draisey.ca> <mattdraisey@sympatico.ca>
 Matt Kraai <kraai@ftbfs.org> <matt.kraai@amo.abbott.com>
 Matt McCutchen <matt@mattmccutchen.net> <hashproduct@gmail.com>

Documentation/CodingGuidelines

@@ -43,10 +43,7 @@ the overall style of existing code. Modifications to existing
 code is expected to match the style the surrounding code already
 uses (even if it doesn't match the overall style of existing code).
 
-But if you must have a list of rules, here are some language
-specific ones. Note that Documentation/ToolsForGit.txt document
-has a collection of tips to help you use some external tools
-to conform to these guidelines.
+But if you must have a list of rules, here they are.
 
 For shell scripts specifically (not exhaustive):
 
@@ -162,6 +159,8 @@ For shell scripts specifically (not exhaustive):
 
    - We do not use \{m,n\};
 
+   - We do not use -E;
+
    - We do not use ? or + (which are \{0,1\} and \{1,\}
      respectively in BRE) but that goes without saying as these
      are ERE elements not BRE (note that \? and \+ are not even part
@@ -202,19 +201,10 @@ For C programs:
    by e.g. "echo DEVELOPER=1 >>config.mak".
 
  - We try to support a wide range of C compilers to compile Git with,
-   including old ones.  As of Git v2.35.0 Git requires C99 (we check
-   "__STDC_VERSION__"). You should not use features from a newer C
+   including old ones.  You should not use features from newer C
    standard, even if your compiler groks them.
 
-   New C99 features have been phased in gradually, if something's new
-   in C99 but not used yet don't assume that it's safe to use, some
-   compilers we target have only partial support for it. These are
-   considered safe to use:
-
-   . since around 2007 with 2b6854c863a, we have been using
-     initializer elements which are not computable at load time. E.g.:
-
-	const char *args[] = {"constant", variable, NULL};
+   There are a few exceptions to this guideline:
 
    . since early 2012 with e1327023ea, we have been using an enum
      definition whose last element is followed by a comma.  This, like
@@ -230,24 +220,18 @@ For C programs:
    . since early 2021 with 765dc168882, we have been using variadic
      macros, mostly for printf-like trace and debug macros.
 
-   . since late 2021 with 44ba10d6, we have had variables declared in
-     the for loop "for (int i = 0; i < 10; i++)".
-
-   New C99 features that we cannot use yet:
-
-   . %z and %zu as a printf() argument for a size_t (the %z being for
-     the POSIX-specific ssize_t). Instead you should use
-     printf("%"PRIuMAX, (uintmax_t)v).  These days the MSVC version we
-     rely on supports %z, but the C library used by MinGW does not.
-
-   . Shorthand like ".a.b = *c" in struct initializations is known to
-     trip up an older IBM XLC version, use ".a = { .b = *c }" instead.
-     See the 33665d98 (reftable: make assignments portable to AIX xlc
-     v12.01, 2022-03-28).
+   These used to be forbidden, but we have not heard any breakage
+   report, and they are assumed to be safe.
 
  - Variables have to be declared at the beginning of the block, before
    the first statement (i.e. -Wdeclaration-after-statement).
 
+ - Declaring a variable in the for loop "for (int i = 0; i < 10; i++)"
+   is still not allowed in this codebase.  We are in the process of
+   allowing it by waiting to see that 44ba10d6 (revision: use C99
+   declaration of variable in for() loop, 2021-11-14) does not get
+   complaints.  Let's revisit this around November 2022.
+
  - NULL pointers shall be written as NULL, not as 0.
 
  - When declaring pointers, the star sides with the variable
@@ -508,6 +492,17 @@ For Perl programs:
 
  - Learn and use Git.pm if you need that functionality.
 
+ - For Emacs, it's useful to put the following in
+   GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
+
+    ;; note the first part is useful for C editing, too
+    ((nil . ((indent-tabs-mode . t)
+                  (tab-width . 8)
+                  (fill-column . 80)))
+     (cperl-mode . ((cperl-indent-level . 8)
+                    (cperl-extra-newline-before-brace . nil)
+                    (cperl-merge-trailing-else . t))))
+
 For Python scripts:
 
  - We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/).
@@ -619,7 +614,7 @@ Writing Documentation:
     avoidance of gendered pronouns.
 
   - When it becomes awkward to stick to this style, prefer "you" when
-    addressing the hypothetical user, and possibly "we" 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
@@ -663,8 +658,8 @@ Writing Documentation:
    (One or more of <file>.)
 
  Optional parts are enclosed in square brackets:
-   [<file>...]
-   (Zero or more of <file>.)
+   [<extra>]
+   (Zero or one <extra>.)
 
    --exec-path[=<path>]
    (Option with an optional argument.  Note that the "=" is inside the
@@ -678,16 +673,6 @@ Writing Documentation:
    [-q | --quiet]
    [--utf8 | --no-utf8]
 
- Use spacing around "|" token(s), but not immediately after opening or
- before closing a [] or () pair:
-   Do: [-q | --quiet]
-   Don't: [-q|--quiet]
-
- Don't use spacing around "|" tokens when they're used to seperate the
- alternate arguments of an option:
-    Do: --track[=(direct|inherit)]
-    Don't: --track[=(direct | inherit)]
-
  Parentheses are used for grouping:
    [(<rev> | <range>)...]
    (Any number of either <rev> or <range>.  Parens are needed to make

Documentation/Makefile

@@ -21,25 +21,13 @@ MAN1_TXT += $(filter-out \
 MAN1_TXT += git.txt
 MAN1_TXT += gitk.txt
 MAN1_TXT += gitweb.txt
-MAN1_TXT += scalar.txt
 
 # man5 / man7 guides (note: new guides should also be added to command-list.txt)
 MAN5_TXT += gitattributes.txt
-MAN5_TXT += gitformat-bundle.txt
-MAN5_TXT += gitformat-chunk.txt
-MAN5_TXT += gitformat-commit-graph.txt
-MAN5_TXT += gitformat-index.txt
-MAN5_TXT += gitformat-pack.txt
-MAN5_TXT += gitformat-signature.txt
 MAN5_TXT += githooks.txt
 MAN5_TXT += gitignore.txt
 MAN5_TXT += gitmailmap.txt
 MAN5_TXT += gitmodules.txt
-MAN5_TXT += gitprotocol-capabilities.txt
-MAN5_TXT += gitprotocol-common.txt
-MAN5_TXT += gitprotocol-http.txt
-MAN5_TXT += gitprotocol-pack.txt
-MAN5_TXT += gitprotocol-v2.txt
 MAN5_TXT += gitrepository-layout.txt
 MAN5_TXT += gitweb.conf.txt
 
@@ -63,7 +51,6 @@ HOWTO_TXT += $(wildcard howto/*.txt)
 
 DOC_DEP_TXT += $(wildcard *.txt)
 DOC_DEP_TXT += $(wildcard config/*.txt)
-DOC_DEP_TXT += $(wildcard includes/*.txt)
 
 ifdef MAN_FILTER
 MAN_TXT = $(filter $(MAN_FILTER),$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT))
@@ -103,24 +90,28 @@ 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 += ReviewingGuidelines
 TECH_DOCS += MyFirstContribution
 TECH_DOCS += MyFirstObjectWalk
 TECH_DOCS += SubmittingPatches
-TECH_DOCS += ToolsForGit
-TECH_DOCS += technical/bitmap-format
-TECH_DOCS += technical/bundle-uri
+TECH_DOCS += technical/bundle-format
 TECH_DOCS += technical/hash-function-transition
+TECH_DOCS += technical/http-protocol
+TECH_DOCS += technical/index-format
 TECH_DOCS += technical/long-running-process-protocol
 TECH_DOCS += technical/multi-pack-index
+TECH_DOCS += technical/pack-format
 TECH_DOCS += technical/pack-heuristics
+TECH_DOCS += technical/pack-protocol
 TECH_DOCS += technical/parallel-checkout
 TECH_DOCS += technical/partial-clone
+TECH_DOCS += technical/protocol-capabilities
+TECH_DOCS += technical/protocol-common
+TECH_DOCS += technical/protocol-v2
 TECH_DOCS += technical/racy-git
 TECH_DOCS += technical/reftable
-TECH_DOCS += technical/scalar
 TECH_DOCS += technical/send-pack-pipeline
 TECH_DOCS += technical/shallow
+TECH_DOCS += technical/signature-format
 TECH_DOCS += technical/trivial-merge
 SP_ARTICLES += $(TECH_DOCS)
 SP_ARTICLES += technical/api-index
@@ -296,8 +287,6 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
 	cmds-synchingrepositories.txt \
 	cmds-synchelpers.txt \
 	cmds-guide.txt \
-	cmds-developerinterfaces.txt \
-	cmds-userinterfaces.txt \
 	cmds-purehelpers.txt \
 	cmds-foreignscminterface.txt
 
@@ -313,12 +302,12 @@ $(mergetools_txt): mergetools-list.made
 
 mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
 	$(QUIET_GEN) \
-	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=diff && \
+	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
 		. ../git-mergetool--lib.sh && \
-		show_tool_names can_diff' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-diff.txt && \
-	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=merge && \
+		show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
+	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
 		. ../git-mergetool--lib.sh && \
-		show_tool_names can_merge' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-merge.txt && \
+		show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
 	date >$@
 
 TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))
@@ -351,16 +340,8 @@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
 manpage-base-url.xsl: manpage-base-url.xsl.in
 	$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
 
-
-manpage-prereqs := manpage-base-url.xsl $(wildcard manpage*.xsl)
-manpage-cmd = $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
-
-%.1 : %.xml $(manpage-prereqs)
-	$(manpage-cmd)
-%.5 : %.xml $(manpage-prereqs)
-	$(manpage-cmd)
-%.7 : %.xml $(manpage-prereqs)
-	$(manpage-cmd)
+%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
+	$(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 
 %.xml : %.txt $(ASCIIDOC_DEPS)
 	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
@@ -484,19 +465,8 @@ $(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt
 .PHONY: lint-docs-man-section-order
 lint-docs-man-section-order: $(LINT_DOCS_MAN_SECTION_ORDER)
 
-.PHONY: lint-docs-fsck-msgids
-LINT_DOCS_FSCK_MSGIDS = .build/lint-docs/fsck-msgids.ok
-$(LINT_DOCS_FSCK_MSGIDS): lint-fsck-msgids.perl
-$(LINT_DOCS_FSCK_MSGIDS): ../fsck.h fsck-msgids.txt
-	$(call mkdir_p_parent_template)
-	$(QUIET_GEN)$(PERL_PATH) lint-fsck-msgids.perl \
-		../fsck.h fsck-msgids.txt $@
-
-lint-docs-fsck-msgids: $(LINT_DOCS_FSCK_MSGIDS)
-
 ## Lint: list of targets above
 .PHONY: lint-docs
-lint-docs: lint-docs-fsck-msgids
 lint-docs: lint-docs-gitlink
 lint-docs: lint-docs-man-end-blurb
 lint-docs: lint-docs-man-section-order

Documentation/MyFirstContribution.txt

@@ -710,104 +710,13 @@ dependencies. `prove` also makes the output nicer.
 Go ahead and commit this change, as well.
 
 [[ready-to-share]]
-== Getting Ready to Share: Anatomy of a Patch Series
+== Getting Ready to Share
 
 You may have noticed already that the Git project performs its code reviews via
 emailed patches, which are then applied by the maintainer when they are ready
-and approved by the community. The Git project does not accept contributions from
+and approved by the community. The Git project does not accept patches from
 pull requests, and the patches emailed for review need to be formatted a
-specific way.
-
-:patch-series: https://lore.kernel.org/git/pull.1218.git.git.1645209647.gitgitgadget@gmail.com/
-:lore: https://lore.kernel.org/git/
-
-Before taking a look at how to convert your commits into emailed patches,
-let's analyze what the end result, a "patch series", looks like. Here is an
-{patch-series}[example] of the summary view for a patch series on the web interface of
-the {lore}[Git mailing list archive]:
-
-----
-2022-02-18 18:40 [PATCH 0/3] libify reflog John Cai via GitGitGadget
-2022-02-18 18:40 ` [PATCH 1/3] reflog: libify delete reflog function and helpers John Cai via GitGitGadget
-2022-02-18 19:10   ` Ævar Arnfjörð Bjarmason [this message]
-2022-02-18 19:39     ` Taylor Blau
-2022-02-18 19:48       ` Ævar Arnfjörð Bjarmason
-2022-02-18 19:35   ` Taylor Blau
-2022-02-21  1:43     ` John Cai
-2022-02-21  1:50       ` Taylor Blau
-2022-02-23 19:50         ` John Cai
-2022-02-18 20:00   ` // other replies elided
-2022-02-18 18:40 ` [PATCH 2/3] reflog: call reflog_delete from reflog.c John Cai via GitGitGadget
-2022-02-18 19:15   ` Ævar Arnfjörð Bjarmason
-2022-02-18 20:26     ` Junio C Hamano
-2022-02-18 18:40 ` [PATCH 3/3] stash: call reflog_delete from reflog.c John Cai via GitGitGadget
-2022-02-18 19:20   ` Ævar Arnfjörð Bjarmason
-2022-02-19  0:21     ` Taylor Blau
-2022-02-22  2:36     ` John Cai
-2022-02-22 10:51       ` Ævar Arnfjörð Bjarmason
-2022-02-18 19:29 ` [PATCH 0/3] libify reflog Ævar Arnfjörð Bjarmason
-2022-02-22 18:30 ` [PATCH v2 0/3] libify reflog John Cai via GitGitGadget
-2022-02-22 18:30   ` [PATCH v2 1/3] stash: add test to ensure reflog --rewrite --updatref behavior John Cai via GitGitGadget
-2022-02-23  8:54     ` Ævar Arnfjörð Bjarmason
-2022-02-23 21:27       ` Junio C Hamano
-// continued
-----
-
-We can note a few things:
-
-- Each commit is sent as a separate email, with the commit message title as
-  subject, prefixed with "[PATCH _i_/_n_]" for the _i_-th commit of an
-  _n_-commit series.
-- Each patch is sent as a reply to an introductory email called the _cover
-  letter_ of the series, prefixed "[PATCH 0/_n_]".
-- Subsequent iterations of the patch series are labelled "PATCH v2", "PATCH
-  v3", etc. in place of "PATCH". For example, "[PATCH v2 1/3]" would be the first of
-  three patches in the second iteration. Each iteration is sent with a new cover
-  letter (like "[PATCH v2 0/3]" above), itself a reply to the cover letter of the
-  previous iteration (more on that below).
-
-NOTE: A single-patch topic is sent with "[PATCH]", "[PATCH v2]", etc. without
-_i_/_n_ numbering (in the above thread overview, no single-patch topic appears,
-though).
-
-[[cover-letter]]
-=== The cover letter
-
-In addition to an email per patch, the Git community also expects your patches
-to come with a cover letter. This is an important component of change
-submission as it explains to the community from a high level what you're trying
-to do, and why, in a way that's more apparent than just looking at your
-patches.
-
-The title of your cover letter should be something which succinctly covers the
-purpose of your entire topic branch. It's often in the imperative mood, just
-like our commit message titles. Here is how we'll title our series:
-
----
-Add the 'psuh' command
----
-
-The body of the cover letter is used to give additional context to reviewers.
-Be sure to explain anything your patches don't make clear on their own, but
-remember that since the cover letter is not recorded in the commit history,
-anything that might be useful to future readers of the repository's history
-should also be in your commit messages.
-
-Here's an example body for `psuh`:
-
-----
-Our internal metrics indicate widespread interest in the command
-git-psuh - that is, many users are trying to use it, but finding it is
-unavailable, using some unknown workaround instead.
-
-The following handful of patches add the psuh command and implement some
-handy features on top of it.
-
-This patchset is part of the MyFirstContribution tutorial and should not
-be merged.
-----
-
-At this point the tutorial diverges, in order to demonstrate two
+specific way. At this point the tutorial diverges, in order to demonstrate two
 different methods of formatting your patchset and getting it reviewed.
 
 The first method to be covered is GitGitGadget, which is useful for those
@@ -899,22 +808,8 @@ https://github.com/gitgitgadget/git and open a PR either with the "New pull
 request" button or the convenient "Compare & pull request" button that may
 appear with the name of your newly pushed branch.
 
-Review the PR's title and description, as they're used by GitGitGadget
-respectively as the subject and body of the cover letter for your change. Refer
-to <<cover-letter,"The cover letter">> above for advice on how to title your
-submission and what content to include in the description.
-
-NOTE: For single-patch contributions, your commit message should already be
-meaningful and explain at a high level the purpose (what is happening and why)
-of your patch, so you usually do not need any additional context. In that case,
-remove the PR description that GitHub automatically generates from your commit
-message (your PR description should be empty). If you do need to supply even
-more context, you can do so in that space and it will be appended to the email
-that GitGitGadget will send, between the three-dash line and the diffstat
-(see <<single-patch,Bonus Chapter: One-Patch Changes>> for how this looks once
-submitted).
-
-When you're happy, submit your pull request.
+Review the PR's title and description, as it's used by GitGitGadget as the cover
+letter for your change. When you're happy, submit your pull request.
 
 [[run-ci-ggg]]
 === Running CI and Getting Ready to Send
@@ -1057,29 +952,49 @@ but want reviewers to look at what they have so far. You can add this flag with
 Check and make sure that your patches and cover letter template exist in the
 directory you specified - you're nearly ready to send out your review!
 
-[[preparing-cover-letter]]
+[[cover-letter]]
 === Preparing Email
 
-Since you invoked `format-patch` with `--cover-letter`, you've already got a
-cover letter template ready. Open it up in your favorite editor.
+In addition to an email per patch, the Git community also expects your patches
+to come with a cover letter, typically with a subject line [PATCH 0/x] (where
+x is the number of patches you're sending). Since you invoked `format-patch`
+with `--cover-letter`, you've already got a template ready. Open it up in your
+favorite editor.
 
 You should see a number of headers present already. Check that your `From:`
-header is correct. Then modify your `Subject:` (see <<cover-letter,above>> for
-how to choose good title for your patch series):
+header is correct. Then modify your `Subject:` to something which succinctly
+covers the purpose of your entire topic branch, for example:
 
 ----
-Subject: [PATCH 0/7] Add the 'psuh' command
+Subject: [PATCH 0/7] adding the 'psuh' command
 ----
 
 Make sure you retain the ``[PATCH 0/X]'' part; that's what indicates to the Git
-community that this email is the beginning of a patch series, and many
-reviewers filter their email for this type of flag.
+community that this email is the beginning of a review, and many reviewers
+filter their email for this type of flag.
 
 You'll need to add some extra parameters when you invoke `git send-email` to add
 the cover letter.
 
-Next you'll have to fill out the body of your cover letter. Again, see
-<<cover-letter,above>> for what content to include.
+Next you'll have to fill out the body of your cover letter. This is an important
+component of change submission as it explains to the community from a high level
+what you're trying to do, and why, in a way that's more apparent than just
+looking at your diff. Be sure to explain anything your diff doesn't make clear
+on its own.
+
+Here's an example body for `psuh`:
+
+----
+Our internal metrics indicate widespread interest in the command
+git-psuh - that is, many users are trying to use it, but finding it is
+unavailable, using some unknown workaround instead.
+
+The following handful of patches add the psuh command and implement some
+handy features on top of it.
+
+This patchset is part of the MyFirstContribution tutorial and should not
+be merged.
+----
 
 The template created by `git format-patch --cover-letter` includes a diffstat.
 This gives reviewers a summary of what they're in for when reviewing your topic.
@@ -1160,7 +1075,7 @@ 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".
 
-After you run this command, `format-patch` will output the patches to the `psuh/`
+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

Documentation/MyFirstObjectWalk.txt

@@ -534,7 +534,7 @@ the arguments to `traverse_commit_list()`.
 - `void *show_data`: A context buffer which is passed in turn to `show_commit`
   and `show_object`.
 
-In addition, `traverse_commit_list_filtered()` has an additional parameter:
+In addition, `traverse_commit_list_filtered()` has an additional paramter:
 
 - `struct oidset *omitted`: A linked-list of object IDs which the provided
   filter caused to be omitted.

Documentation/RelNotes/2.30.8.txt

@@ -0,0 +1,52 @@
+Git v2.30.8 Release Notes
+=========================
+
+This release addresses the security issues CVE-2023-22490 and
+CVE-2023-23946.
+
+
+Fixes since v2.30.7
+-------------------
+
+ * CVE-2023-22490:
+
+   Using a specially-crafted repository, Git can be tricked into using
+   its local clone optimization even when using a non-local transport.
+   Though Git will abort local clones whose source $GIT_DIR/objects
+   directory contains symbolic links (c.f., CVE-2022-39253), the objects
+   directory itself may still be a symbolic link.
+
+   These two may be combined to include arbitrary files based on known
+   paths on the victim's filesystem within the malicious repository's
+   working copy, allowing for data exfiltration in a similar manner as
+   CVE-2022-39253.
+
+ * CVE-2023-23946:
+
+   By feeding a crafted input to "git apply", a path outside the
+   working tree can be overwritten as the user who is running "git
+   apply".
+
+ * A mismatched type in `attr.c::read_attr_from_index()` which could
+   cause Git to errantly reject attributes on Windows and 32-bit Linux
+   has been corrected.
+
+Credit for finding CVE-2023-22490 goes to yvvdwf, and the fix was
+developed by Taylor Blau, with additional help from others on the
+Git security mailing list.
+
+Credit for finding CVE-2023-23946 goes to Joern Schneeweisz, and the
+fix was developed by Patrick Steinhardt.
+
+
+Johannes Schindelin (1):
+      attr: adjust a mismatched data type
+
+Patrick Steinhardt (1):
+      apply: fix writing behind newly created symbolic links
+
+Taylor Blau (3):
+      t5619: demonstrate clone_local() with ambiguous transport
+      clone: delay picking a transport until after get_repo_path()
+      dir-iterator: prevent top-level symlinks without FOLLOW_SYMLINKS
+

Documentation/RelNotes/2.31.7.txt

@@ -0,0 +1,6 @@
+Git v2.31.7 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.8 to
+address the security issues CVE-2023-22490 and CVE-2023-23946;
+see the release notes for that version for details.

Documentation/RelNotes/2.32.6.txt

@@ -0,0 +1,6 @@
+Git v2.32.6 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.8 and v2.31.7
+to address the security issues CVE-2023-22490 and CVE-2023-23946;
+see the release notes for these versions for details.

Documentation/RelNotes/2.33.7.txt

@@ -0,0 +1,7 @@
+Git v2.33.7 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.8, v2.31.7
+and v2.32.6 to address the security issues CVE-2023-22490 and
+CVE-2023-23946; see the release notes for these versions for
+details.

Documentation/RelNotes/2.34.7.txt

@@ -0,0 +1,7 @@
+Git v2.34.7 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.8, v2.31.7,
+v2.32.6 and v2.33.7 to address the security issues CVE-2023-22490
+and CVE-2023-23946; see the release notes for these versions
+for details.

Documentation/RelNotes/2.35.7.txt

@@ -0,0 +1,7 @@
+Git v2.35.7 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.8, v2.31.7,
+v2.32.6, v2.33.7 and v2.34.7 to address the security issues
+CVE-2023-22490 and CVE-2023-23946; see the release notes for
+these versions for details.

Documentation/RelNotes/2.36.5.txt

@@ -0,0 +1,7 @@
+Git v2.36.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.8, v2.31.7,
+v2.32.6, v2.33.7, v2.34.7 and v2.35.7 to address the security
+issues CVE-2023-22490 and CVE-2023-23946; see the release notes
+for these versions for details.

Documentation/RelNotes/2.37.0.txt

@@ -1,337 +0,0 @@
-Git v2.37 Release Notes
-=======================
-
-UI, Workflows & Features
-
- * "vimdiff[123]" mergetool drivers have been reimplemented with a
-   more generic layout mechanism.
-
- * "git -v" and "git -h" are now understood as "git --version" and
-   "git --help".
-
- * The temporary files fed to external diff command are now generated
-   inside a new temporary directory under the same basename.
-
- * "git log --since=X" will stop traversal upon seeing a commit that
-   is older than X, but there may be commits behind it that is younger
-   than X when the commit was created with a faulty clock.  A new
-   option is added to keep digging without stopping, and instead
-   filter out commits with timestamp older than X.
-
- * "git -c branch.autosetupmerge=simple branch $A $B" will set the $B
-   as $A's upstream only when $A and $B shares the same name, and "git
-   -c push.default=simple" on branch $A would push to update the
-   branch $A at the remote $B came from.  Also more places use the
-   sole remote, if exists, before defaulting to 'origin'.
-
- * A new doc has been added that lists tips for tools to work with
-   Git's codebase.
-
- * "git remote -v" now shows the list-objects-filter used during
-   fetching from the remote, if available.
-
- * With the new http.curloptResolve configuration, the CURLOPT_RESOLVE
-   mechanism that allows cURL based applications to use pre-resolved
-   IP addresses for the requests is exposed to the scripts.
-
- * "git add -i" was rewritten in C some time ago and has been in
-   testing; the reimplementation is now exposed to general public by
-   default.
-
- * Deprecate non-cone mode of the sparse-checkout feature.
-
- * Introduce a filesystem-dependent mechanism to optimize the way the
-   bits for many loose object files are ensured to hit the disk
-   platter.
-
- * The "do not remove the directory the user started Git in" logic,
-   when Git cannot tell where that directory is, is disabled.  Earlier
-   we refused to run in such a case.
-
- * A mechanism to pack unreachable objects into a "cruft pack",
-   instead of ejecting them into loose form to be reclaimed later, has
-   been introduced.
-
- * Update the doctype written in gitweb output to xhtml5.
-
- * The "transfer.credentialsInURL" configuration variable controls what
-   happens when a URL with embedded login credential is used on either
-   "fetch" or "push". Credentials are currently only detected in
-   `remote.<name>.url` config, not `remote.<name>.pushurl`.
-
- * "git revert" learns "--reference" option to use more human-readable
-   reference to the commit it reverts in the message template it
-   prepares for the user.
-
- * Various error messages that talk about the removal of
-   "--preserve-merges" in "rebase" have been strengthened, and "rebase
-   --abort" learned to get out of a state that was left by an earlier
-   use of the option.
-
-
-Performance, Internal Implementation, Development Support etc.
-
- * The performance of the "untracked cache" feature has been improved
-   when "--untracked-files=<mode>" and "status.showUntrackedFiles"
-   are combined.
-
- * "git stash" works better with sparse index entries.
-
- * "git show :<path>" learned to work better with the sparse-index
-   feature.
-
- * Introduce and apply coccinelle rule to discourage an explicit
-   comparison between a pointer and NULL, and applies the clean-up to
-   the maintenance track.
-
- * Preliminary code refactoring around transport and bundle code.
-
- * "sparse-checkout" learns to work better with the sparse-index
-   feature.
-
- * A workflow change for translators are being proposed.  git.pot is
-   no longer version controlled and it is local responsibility of
-   translators to generate it.
-
- * Plug the memory leaks from the trickiest API of all, the revision
-   walker.
-
- * Rename .env_array member to .env in the child_process structure.
-
-  * The fsmonitor--daemon handles even more corner cases when
-    watching filesystem events.
-
- * A new bug() and BUG_if_bug() API is introduced to make it easier to
-   uniformly log "detect multiple bugs and abort in the end" pattern.
-
-
-Fixes since v2.36
------------------
-
- * "git submodule update" without pathspec should silently skip an
-   uninitialized submodule, but it started to become noisy by mistake.
-   (merge 4f1ccef87c gc/submodule-update-part2 later to maint).
-
- * "diff-tree --stdin" has been broken for about a year, but 2.36
-   release broke it even worse by breaking running the command with
-   <pathspec>, which in turn broke "gitk" and got noticed.  This has
-   been corrected by aligning its behaviour to that of "log".
-   (merge f8781bfda3 jc/diff-tree-stdin-fix later to maint).
-
- * Regression fix for 2.36 where "git name-rev" started to sometimes
-   reference strings after they are freed.
-   (merge 45a14f578e rs/name-rev-fix-free-after-use later to maint).
-
- * "git show <commit1> <commit2>... -- <pathspec>" lost the pathspec
-   when showing the second and subsequent commits, which has been
-   corrected.
-   (merge 5cdb38458e jc/show-pathspec-fix later to maint).
-
- * "git fast-export -- <pathspec>" lost the pathspec when showing the
-   second and subsequent commits, which has been corrected.
-   (merge d1c25272f5 rs/fast-export-pathspec-fix later to maint).
-
- * "git format-patch <args> -- <pathspec>" lost the pathspec when
-   showing the second and subsequent commits, which has been
-   corrected.
-   (merge 91f8f7e46f rs/format-patch-pathspec-fix later to maint).
-
- * "git clone --origin X" leaked piece of memory that held value read
-   from the clone.defaultRemoteName configuration variable, which has
-   been plugged.
-   (merge 6dfadc8981 jc/clone-remote-name-leak-fix later to maint).
-
- * Get rid of a bogus and over-eager coccinelle rule.
-   (merge 08bdd3a185 jc/cocci-xstrdup-or-null-fix later to maint).
-
- * The path taken by "git multi-pack-index" command from the end user
-   was compared with path internally prepared by the tool without first
-   normalizing, which lead to duplicated paths not being noticed,
-   which has been corrected.
-   (merge 11f9e8de3d ds/midx-normalize-pathname-before-comparison later to maint).
-
- * Correct choices of C compilers used in various CI jobs.
-   (merge 3506cae04f ab/cc-package-fixes later to maint).
-
- * Various cleanups to "git p4".
-   (merge 4ff0108d9e jh/p4-various-fixups later to maint).
-
- * The progress meter of "git blame" was showing incorrect numbers
-   when processing only parts of the file.
-   (merge e5f5d7d42e ea/progress-partial-blame later to maint).
-
- * "git rebase --keep-base <upstream> <branch-to-rebase>" computed the
-   commit to rebase onto incorrectly, which has been corrected.
-   (merge 9e5ebe9668 ah/rebase-keep-base-fix later to maint).
-
- * Fix a leak of FILE * in an error codepath.
-   (merge c0befa0c03 kt/commit-graph-plug-fp-leak-on-error later to maint).
-
- * Avoid problems from interaction between malloc_check and address
-   sanitizer.
-   (merge 067109a5e7 pw/test-malloc-with-sanitize-address later to maint).
-
- * The commit summary shown after making a commit is matched to what
-   is given in "git status" not to use the break-rewrite heuristics.
-   (merge 84792322ed rs/commit-summary-wo-break-rewrite later to maint).
-
- * Update a few end-user facing messages around EOL conversion.
-   (merge c970d30c2c ah/convert-warning-message later to maint).
-
- * Trace2 documentation updates.
-   (merge a6c80c313c js/trace2-doc-fixes later to maint).
-
- * Build procedure fixup.
-   (merge 1fbfd96f50 mg/detect-compiler-in-c-locale later to maint).
-
- * "git pull" without "--recurse-submodules=<arg>" made
-   submodule.recurse take precedence over fetch.recurseSubmodules by
-   mistake, which has been corrected.
-   (merge 5819417365 gc/pull-recurse-submodules later to maint).
-
- * "git bisect" was too silent before it is ready to start computing
-   the actual bisection, which has been corrected.
-   (merge f11046e6de cd/bisect-messages-from-pre-flight-states later to maint).
-
- * macOS CI jobs have been occasionally flaky due to tentative version
-   skew between perforce and the homebrew packager.  Instead of
-   failing the whole CI job, just let it skip the p4 tests when this
-   happens.
-   (merge f15e00b463 cb/ci-make-p4-optional later to maint).
-
- * A bit of test framework fixes with a few fixes to issues found by
-   valgrind.
-   (merge 7c898554d7 ab/valgrind-fixes later to maint).
-
- * "git archive --add-file=<path>" picked up the raw permission bits
-   from the path and propagated to zip output in some cases, without
-   normalization, which has been corrected (tar output did not have
-   this issue).
-   (merge 6a61661967 jc/archive-add-file-normalize-mode later to maint).
-
- * "make coverage-report" without first running "make coverage" did
-   not produce any meaningful result, which has been corrected.
-   (merge 96ddfecc5b ep/coverage-report-wants-test-to-have-run later to maint).
-
- * The "--current" option of "git show-branch" should have been made
-   incompatible with the "--reflog" mode, but this was not enforced,
-   which has been corrected.
-   (merge 41c64ae0e7 jc/show-branch-g-current later to maint).
-
- * "git fetch" unnecessarily failed when an unexpected optional
-   section appeared in the output, which has been corrected.
-   (merge 7709acf7be jt/fetch-peek-optional-section later to maint).
-
- * The way "git fetch" without "--update-head-ok" ensures that HEAD in
-   no worktree points at any ref being updated was too wasteful, which
-   has been optimized a bit.
-   (merge f7400da800 os/fetch-check-not-current-branch later to maint).
-
- * "git fetch --recurse-submodules" from multiple remotes (either from
-   a remote group, or "--all") used to make one extra "git fetch" in
-   the submodules, which has been corrected.
-   (merge 0353c68818 jc/avoid-redundant-submodule-fetch later to maint).
-
- * With a recent update to refuse access to repositories of other
-   people by default, "sudo make install" and "sudo git describe"
-   stopped working, which has been corrected.
-   (merge 6b11e3d52e cb/path-owner-check-with-sudo-plus later to maint).
-
- * The tests that ensured merges stop when interfering local changes
-   are present did not make sure that local changes are preserved; now
-   they do.
-   (merge 4b317450ce jc/t6424-failing-merge-preserve-local-changes later to maint).
-
- * Some real problems noticed by gcc 12 have been fixed, while false
-   positives have been worked around.
-
- * Update the version of FreeBSD image used in Cirrus CI.
-   (merge c58bebd4c6 pb/use-freebsd-12.3-in-cirrus-ci later to maint).
-
- * The multi-pack-index code did not protect the packfile it is going
-   to depend on from getting removed while in use, which has been
-   corrected.
-   (merge 4090511e40 tb/midx-race-in-pack-objects later to maint).
-
- * Teach "git repack --geometric" work better with "--keep-pack" and
-   avoid corrupting the repository when packsize limit is used.
-   (merge 66731ff921 tb/geom-repack-with-keep-and-max later to maint).
-
- * The documentation on the interaction between "--add-file" and
-   "--prefix" options of "git archive" has been improved.
-   (merge a75910602a rs/document-archive-prefix later to maint).
-
- * A git subcommand like "git add -p" spawns a separate git process
-   while relaying its command line arguments.  A pathspec with only
-   negative elements was mistakenly passed with an empty string, which
-   has been corrected.
-   (merge b02fdbc80a jc/all-negative-pathspec later to maint).
-
- * With a more targeted workaround in http.c in another topic, we may
-   be able to lift this blanket "GCC12 dangling-pointer warning is
-   broken and unsalvageable" workaround.
-   (merge 419141e495 cb/buggy-gcc-12-workaround later to maint).
-
- * A misconfigured 'branch..remote' led to a bug in configuration
-   parsing.
-   (merge f1dfbd9ee0 gc/zero-length-branch-config-fix later to maint).
-
- * "git -c diff.submodule=log range-diff" did not show anything for
-   submodules that changed in the ranges being compared, and
-   "git -c diff.submodule=diff range-diff" did not work correctly.
-   Fix this by including the "--submodule=short" output
-   unconditionally to be compared.
-
- * In Git 2.36 we revamped the way how hooks are invoked.  One change
-   that is end-user visible is that the output of a hook is no longer
-   directly connected to the standard output of "git" that spawns the
-   hook, which was noticed post release.  This is getting corrected.
-   (merge a082345372 ab/hooks-regression-fix later to maint).
-
- * Updating the graft information invalidates the list of parents of
-   in-core commit objects that used to be in the graft file.
-
- * "git show-ref --heads" (and "--tags") still iterated over all the
-   refs only to discard refs outside the specified area, which has
-   been corrected.
-   (merge c0c9d35e27 tb/show-ref-optim later to maint).
-
- * Remove redundant copying (with index v3 and older) or possible
-   over-reading beyond end of mmapped memory (with index v4) has been
-   corrected.
-   (merge 6d858341d2 zh/read-cache-copy-name-entry-fix later to maint).
-
- * Sample watchman interface hook sometimes failed to produce
-   correctly formatted JSON message, which has been corrected.
-   (merge 134047b500 sn/fsmonitor-missing-clock later to maint).
-
- * Use-after-free (with another forget-to-free) fix.
-   (merge 323822c72b ab/remote-free-fix later to maint).
-
- * Remove a coccinelle rule that is no longer relevant.
-   (merge b1299de4a1 jc/cocci-cleanup later to maint).
-
- * Other code cleanup, docfix, build fix, etc.
-   (merge e6b2582da3 cm/reftable-0-length-memset later to maint).
-   (merge 0b75e5bf22 ab/misc-cleanup later to maint).
-   (merge 52e1ab8a76 ea/rebase-code-simplify later to maint).
-   (merge 756d15923b sg/safe-directory-tests-and-docs later to maint).
-   (merge d097a23bfa ds/do-not-call-bug-on-bad-refs later to maint).
-   (merge c36c27e75c rs/t7812-pcre2-ws-bug-test later to maint).
-   (merge 1da312742d gf/unused-includes later to maint).
-   (merge 465b30a92d pb/submodule-recurse-mode-enum later to maint).
-   (merge 82b28c4ed8 km/t3501-use-test-helpers later to maint).
-   (merge 72315e431b sa/t1011-use-helpers later to maint).
-   (merge 95b3002201 cg/vscode-with-gdb later to maint).
-   (merge fbe5f6b804 tk/p4-utf8-bom later to maint).
-   (merge 17f273ffba tk/p4-with-explicity-sync later to maint).
-   (merge 944db25c60 kf/p4-multiple-remotes later to maint).
-   (merge b014cee8de jc/update-ozlabs-url later to maint).
-   (merge 4ec5008062 pb/ggg-in-mfc-doc later to maint).
-   (merge af845a604d tb/receive-pack-code-cleanup later to maint).
-   (merge 2acf4cf001 js/ci-gcc-12-fixes later to maint).
-   (merge 05e280c0a6 jc/http-clear-finished-pointer later to maint).
-   (merge 8c49d704ef fh/transport-push-leakfix later to maint).
-   (merge 1d232d38bd tl/ls-tree-oid-only later to maint).
-   (merge db7961e6a6 gc/document-config-worktree-scope later to maint).
-   (merge ce18a30bb7 fs/ssh-default-key-command-doc later to maint).

Documentation/RelNotes/2.37.1.txt

@@ -1,17 +0,0 @@
-Git 2.37.1 Release Notes
-========================
-
-This release merges up the fixes that appear in v2.30.5, v2.31.4,
-v2.32.3, v2.33.4, v2.34.4, v2.35.4, and v2.36.2 to address the
-security issue CVE-2022-29187; see the release notes for these
-versions for details.
-
-Fixes since Git 2.37
---------------------
-
- * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
-   correctly record a removed file to the index, which is an old
-   regression but has become widely known because the C version has
-   become the default in the latest release.
-
- * Fix for CVS-2022-29187.

Documentation/RelNotes/2.37.2.txt

@@ -1,88 +0,0 @@
-Git 2.37.2 Release Notes
-========================
-
-This primarily is to backport various fixes accumulated on the 'master'
-front since 2.37.1.
-
-Fixes since v2.37.1
--------------------
-
- * "git shortlog -n" relied on the underlying qsort() to be stable,
-   which shouldn't have.  Fixed.
-
- * Variable quoting fix in the vimdiff driver of "git mergetool".
-
- * An earlier attempt to plug leaks placed a clean-up label to jump to
-   at a bogus place, which as been corrected.
-
- * Fixes a long-standing corner case bug around directory renames in
-   the merge-ort strategy.
-
- * Recent update to vimdiff layout code has been made more robust
-   against different end-user vim settings.
-
- * In a non-bare repository, the behavior of Git when the
-   core.worktree configuration variable points at a directory that has
-   a repository as its subdirectory, regressed in Git 2.27 days.
-
- * References to commands-to-be-typed-literally in "git rebase"
-   documentation mark-up have been corrected.
-
- * Give _() markings to fatal/warning/usage: labels that are shown in
-   front of these messages.
-
- * "git mktree --missing" lazily fetched objects that are missing from
-   the local object store, which was totally unnecessary for the purpose
-   of creating the tree object(s) from its input.
-
- * Fixes for tests when the source directory has unusual characters in
-   its path, e.g. whitespaces, double-quotes, etc.
-
- * Adjust technical/bitmap-format to be formatted by AsciiDoc, and
-   add some missing information to the documentation.
-
- * Certain diff options are currently ignored when combined-diff is
-   shown; mark them as incompatible with the feature.
-
- * "git clone" from a repository with some ref whose HEAD is unborn
-   did not set the HEAD in the resulting repository correctly, which
-   has been corrected.
-
- * mkstemp() emulation on Windows has been improved.
-
- * Add missing documentation for "include" and "includeIf" features in
-   "git config" file format, which incidentally teaches the command
-   line completion to include them in its offerings.
-
- * Avoid "white/black-list" in documentation and code comments.
-
- * Workaround for a compiler warning against use of die() in
-   osx-keychain (in contrib/).
-
- * Workaround for a false positive compiler warning.
-
- * The resolve-undo information in the index was not protected against
-   GC, which has been corrected.
-
- * A corner case bug where lazily fetching objects from a promisor
-   remote resulted in infinite recursion has been corrected.
-
- * "git p4" working on UTF-16 files on Windows did not implement
-   CRLF-to-LF conversion correctly, which has been corrected.
-
- * "git p4" did not handle non-ASCII client name well, which has been
-   corrected.
-
- * "rerere-train" script (in contrib/) used to honor commit.gpgSign
-   while recreating the throw-away merges.
-
- * "git checkout" miscounted the paths it updated, which has been
-   corrected.
-
- * Fix for a bug that makes write-tree to fail to write out a
-   non-existent index as a tree, introduced in 2.37.
-
- * There was a bug in the codepath to upgrade generation information
-   in commit-graph from v1 to v2 format, which has been corrected.
-
-Also contains minor documentation updates and code clean-ups.

Documentation/RelNotes/2.37.3.txt

@@ -1,46 +0,0 @@
-Git 2.37.3 Release Notes
-========================
-
-This primarily is to backport various fixes accumulated on the 'master'
-front since 2.37.2.
-
-Fixes since v2.37.2
--------------------
-
- * The build procedure for Windows that uses CMake has been updated to
-   pick up the shell interpreter from local installation location.
-
- * Conditionally allow building Python interpreter on Windows
-
- * Fix to lstat() emulation on Windows.
-
- * Older gcc with -Wall complains about the universal zero initializer
-   "struct s = { 0 };" idiom, which makes developers' lives
-   inconvenient (as -Werror is enabled by DEVELOPER=YesPlease).  The
-   build procedure has been tweaked to help these compilers.
-
- * Plug memory leaks in the failure code path in the "merge-ort" merge
-   strategy backend.
-
- * Avoid repeatedly running getconf to ask libc version in the test
-   suite, and instead just as it once per script.
-
- * Platform-specific code that determines if a directory is OK to use
-   as a repository has been taught to report more details, especially
-   on Windows.
-
- * "vimdiff3" regression has been corrected.
-
- * "git fsck" reads mode from tree objects but canonicalizes the mode
-   before passing it to the logic to check object sanity, which has
-   hid broken tree objects from the checking logic.  This has been
-   corrected, but to help exiting projects with broken tree objects
-   that they cannot fix retroactively, the severity of anomalies this
-   code detects has been demoted to "info" for now.
-
- * Fixes to sparse index compatibility work for "reset" and "checkout"
-   commands.
-
- * Documentation for "git add --renormalize" has been improved.
-
-Also contains other minor documentation updates and code clean-ups.

Documentation/RelNotes/2.37.4.txt

@@ -1,65 +0,0 @@
-Git 2.37.4 Release Notes
-========================
-
-This primarily is to backport various fixes accumulated on the 'master'
-front since 2.37.3, and also includes the same security fixes as in
-v2.30.6.
-
-Fixes since v2.37.3
--------------------
-
- * CVE-2022-39253:
-   When relying on the `--local` clone optimization, Git dereferences
-   symbolic links in the source repository before creating hardlinks
-   (or copies) of the dereferenced link in the destination repository.
-   This can lead to surprising behavior where arbitrary files are
-   present in a repository's `$GIT_DIR` when cloning from a malicious
-   repository.
-
-   Git will no longer dereference symbolic links via the `--local`
-   clone mechanism, and will instead refuse to clone repositories that
-   have symbolic links present in the `$GIT_DIR/objects` directory.
-
-   Additionally, the value of `protocol.file.allow` is changed to be
-   "user" by default.
-
-   Credit for finding CVE-2022-39253 goes to Cory Snider of Mirantis.
-   The fix was authored by Taylor Blau, with help from Johannes
-   Schindelin.
-
- * CVE-2022-39260:
-   An overly-long command string given to `git shell` can result in
-   overflow in `split_cmdline()`, leading to arbitrary heap writes and
-   remote code execution when `git shell` is exposed and the directory
-   `$HOME/git-shell-commands` exists.
-
-   `git shell` is taught to refuse interactive commands that are
-   longer than 4MiB in size. `split_cmdline()` is hardened to reject
-   inputs larger than 2GiB.
-
-   Credit for finding CVE-2022-39260 goes to Kevin Backhouse of
-   GitHub. The fix was authored by Kevin Backhouse, Jeff King, and
-   Taylor Blau.
-
- * An earlier optimization discarded a tree-object buffer that is
-   still in use, which has been corrected.
-
- * Fix deadlocks between main Git process and subprocess spawned via
-   the pipe_command() API, that can kill "git add -p" that was
-   reimplemented in C recently.
-
- * xcalloc(), imitating calloc(), takes "number of elements of the
-   array", and "size of a single element", in this order.  A call that
-   does not follow this ordering has been corrected.
-
- * The preload-index codepath made copies of pathspec to give to
-   multiple threads, which were left leaked.
-
- * Update the version of Ubuntu used for GitHub Actions CI from 18.04
-   to 22.04.
-
- * The auto-stashed local changes created by "git merge --autostash"
-   was mixed into a conflicted state left in the working tree, which
-   has been corrected.
-
-Also contains other minor documentation updates and code clean-ups.

Documentation/RelNotes/2.37.5.txt

@@ -1,5 +0,0 @@
-Git v2.37.5 Release Notes
-=========================
-
-This release merges the security fix that appears in v2.30.7; see
-the release notes for that version for details.

Documentation/RelNotes/2.38.0.txt

@@ -1,404 +0,0 @@
-Git v2.38 Release Notes
-=======================
-
-UI, Workflows & Features
-
- * "git remote show [-n] frotz" now pays attention to negative
-   pathspec.
-
- * "git push" sometimes performs poorly when reachability bitmaps are
-   used, even in a repository where other operations are helped by
-   bitmaps.  The push.useBitmaps configuration variable is introduced
-   to allow disabling use of reachability bitmaps only for "git push".
-
- * "git grep -m<max-hits>" is a way to limit the hits shown per file.
-
- * "git merge-tree" learned a new mode where it takes two commits and
-   computes a tree that would result in the merge commit, if the
-   histories leading to these two commits were to be merged.
-
- * "git mv A B" in a sparsely populated working tree can be asked to
-   move a path between directories that are "in cone" (i.e. expected
-   to be materialized in the working tree) and "out of cone"
-   (i.e. expected to be hidden).  The handling of such cases has been
-   improved.
-
- * Earlier, HTTP transport clients learned to tell the server side
-   what locale they are in by sending Accept-Language HTTP header, but
-   this was done only for some requests but not others.
-
- * Introduce a safe.barerepository configuration variable that
-   allows users to forbid discovery of bare repositories.
-
- * Various messages that come from the pack-bitmap codepaths have been
-   tweaked.
-
- * "git rebase -i" learns to update branches whose tip appear in the
-   rebased range with "--update-refs" option.
-
- * "git ls-files" learns the "--format" option to tweak its output.
-
- * "git cat-file" learned an option to use the mailmap when showing
-   commit and tag objects.
-
- * When "git merge" finds that it cannot perform a merge, it should
-   restore the working tree to the state before the command was
-   initiated, but in some corner cases it didn't.
-
- * Operating modes like "--batch" of "git cat-file" command learned to
-   take NUL-terminated input, instead of one-item-per-line.
-
- * "git rm" has become more aware of the sparse-index feature.
-
- * "git rev-list --disk-usage" learned to take an optional value
-   "human" to show the reported value in human-readable format, like
-   "3.40MiB".
-
- * The "diagnose" feature to create a zip archive for diagnostic
-   material has been lifted from "scalar" and made into a feature of
-   "git bugreport".
-
- * The namespaces used by "log --decorate" from "refs/" hierarchy by
-   default has been tightened.
-
- * "git rev-list --ancestry-path=C A..B" is a natural extension of
-   "git rev-list A..B"; instead of choosing a subset of A..B to those
-   that have ancestry relationship with A, it lets a subset with
-   ancestry relationship with C.
-
- * "scalar" now enables built-in fsmonitor on enlisted repositories,
-   when able.
-
- * The bash prompt (in contrib/) learned to optionally indicate when
-   the index is unmerged.
-
- * "git clone" command learned the "--bundle-uri" option to coordinate
-   with hosting sites the use of pre-prepared bundle files.
-
- * "git range-diff" learned to honor pathspec argument if given.
-
- * "git format-patch --from=<ident>" can be told to add an in-body
-   "From:" line even for commits that are authored by the given
-   <ident> with "--force-in-body-from" option.
-
- * The built-in fsmonitor refuses to work on a network mounted
-   repositories; a configuration knob for users to override this has
-   been introduced.
-
- * The "scalar" addition from Microsoft is now part of the core Git
-   installation.
-
-
-Performance, Internal Implementation, Development Support etc.
-
- * Collection of what is referenced by objects in promisor packs have
-   been optimized to inspect these objects in the in-pack order.
-
- * Introduce a helper to see if a branch is already being worked on
-   (hence should not be newly checked out in a working tree), which
-   performs much better than the existing find_shared_symref() to
-   replace many uses of the latter.
-
- * Teach "git archive" to (optionally and then by default) avoid
-   spawning an external "gzip" process when creating ".tar.gz" (and
-   ".tgz") archives.
-
- * Allow large objects read from a packstream to be streamed into a
-   loose object file straight, without having to keep it in-core as a
-   whole.
-
- * Further preparation to turn git-submodule.sh into a builtin
-   continues.
-
- * Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp
-   macro, which would improve maintainability and readability.
-
- * Teach "make all" to build gitweb as well.
-
- * Tweak tests so that they still work when the "git init" template
-   did not create .git/info directory.
-
- * Add Coccinelle rules to detect the pattern of initializing and then
-   finalizing a structure without using it in between at all, which
-   happens after code restructuring and the compilers fail to
-   recognize as an unused variable.
-
- * The code to convert between GPG trust level strings and internal
-   constants we use to represent them have been cleaned up.
-
- * Support for libnettle as SHA256 implementation has been added.
-
- * The way "git multi-pack" uses parse-options API has been improved.
-
- * A Coccinelle rule (in contrib/) to encourage use of COPY_ARRAY
-   macro has been improved.
-
- * API tweak to make it easier to run fuzz testing on commit-graph parser.
-
- * Omit fsync-related trace2 entries when their values are all zero.
-
- * The codepath to write multi-pack index has been taught to release a
-   large chunk of memory that holds an array of objects in the packs,
-   as soon as it is done with the array, to reduce memory consumption.
-
- * Add a level of redirection to array allocation API in xdiff part,
-   to make it easier to share with the libgit2 project.
-
- * "git fetch" client logs the partial clone filter used in the trace2
-   output.
-
- * The "bundle URI" design gets documented.
-
- * The common ancestor negotiation exchange during a "git fetch"
-   session now leaves trace log.
-
- * Test portability improvements.
-   (merge 4d1d843be7 mt/rot13-in-c later to maint).
-
- * The "subcommand" mode is introduced to parse-options API and update
-   the command line parser of Git commands with subcommands.
-
- * The pack bitmap file gained a bitmap-lookup table to speed up
-   locating the necessary bitmap for a given commit.
-
- * The assembly version of SHA-1 implementation for PPC has been
-   removed.
-
- * The server side that responds to "git fetch" and "git clone"
-   request has been optimized by allowing it to send objects in its
-   object store without recomputing and validating the object names.
-
- * Annotate function parameters that are not used (but cannot be
-   removed for structural reasons), to prepare us to later compile
-   with -Wunused warning turned on.
-
- * Share the text used to explain configuration variables used by "git
-   <subcmd>" in "git help <subcmd>" with the text from "git help config".
-
- * "git mv A B" in a sparsely populated working tree can be asked to
-   move a path from a directory that is "in cone" to another directory
-   that is "out of cone".  Handling of such a case has been improved.
-
- * The chainlint script for our tests has been revamped.
-
-
-Fixes since v2.37
------------------
-
- * Rewrite of "git add -i" in C that appeared in Git 2.25 didn't
-   correctly record a removed file to the index, which was fixed.
-
- * Certain diff options are currently ignored when combined-diff is
-   shown; mark them as incompatible with the feature.
-
- * Adjust technical/bitmap-format to be formatted by AsciiDoc, and
-   add some missing information to the documentation.
-
- * Fixes for tests when the source directory has unusual characters in
-   its path, e.g. whitespaces, double-quotes, etc.
-
- * "git mktree --missing" lazily fetched objects that are missing from
-   the local object store, which was totally unnecessary for the purpose
-   of creating the tree object(s) from its input.
-
- * Give _() markings to fatal/warning/usage: labels that are shown in
-   front of these messages.
-
- * References to commands-to-be-typed-literally in "git rebase"
-   documentation mark-up have been corrected.
-
- * In a non-bare repository, the behavior of Git when the
-   core.worktree configuration variable points at a directory that has
-   a repository as its subdirectory, regressed in Git 2.27 days.
-
- * Recent update to vimdiff layout code has been made more robust
-   against different end-user vim settings.
-
- * Plug various memory leaks, both in the main code and in test-tool
-   commands.
-
- * Fixes a long-standing corner case bug around directory renames in
-   the merge-ort strategy.
-
- * The resolve-undo information in the index was not protected against
-   GC, which has been corrected.
-
- * A corner case bug where lazily fetching objects from a promisor
-   remote resulted in infinite recursion has been corrected.
-
- * "git clone" from a repository with some ref whose HEAD is unborn
-   did not set the HEAD in the resulting repository correctly, which
-   has been corrected.
-
- * An earlier attempt to plug leaks placed a clean-up label to jump to
-   at a bogus place, which as been corrected.
-
- * Variable quoting fix in the vimdiff driver of "git mergetool"
-
- * "git shortlog -n" relied on the underlying qsort() to be stable,
-   which shouldn't have.  Fixed.
-
- * A fix for a regression in test framework.
-
- * mkstemp() emulation on Windows has been improved.
-
- * Add missing documentation for "include" and "includeIf" features in
-   "git config" file format, which incidentally teaches the command
-   line completion to include them in its offerings.
-
- * Avoid "white/black-list" in documentation and code comments.
-
- * Workaround for a compiler warning against use of die() in
-   osx-keychain (in contrib/).
-
- * Workaround for a false positive compiler warning.
-
- * "git p4" working on UTF-16 files on Windows did not implement
-   CRLF-to-LF conversion correctly, which has been corrected.
-
- * "git p4" did not handle non-ASCII client name well, which has been
-   corrected.
-
- * "rerere-train" script (in contrib/) used to honor commit.gpgSign
-   while recreating the throw-away merges.
-
- * "git checkout" miscounted the paths it updated, which has been
-   corrected.
-
- * Fix for a bug that makes write-tree to fail to write out a
-   non-existent index as a tree, introduced in 2.37.
-
- * There was a bug in the codepath to upgrade generation information
-   in commit-graph from v1 to v2 format, which has been corrected.
-
- * Gitweb had legacy URL shortener that is specific to the way
-   projects hosted on kernel.org used to (but no longer) work, which
-   has been removed.
-
- * Fix build procedure for Windows that uses CMake so that it can pick
-   up the shell interpreter from local installation location.
-
- * Conditionally allow building Python interpreter on Windows
-
- * Fix to lstat() emulation on Windows.
-
- * Older gcc with -Wall complains about the universal zero initializer
-   "struct s = { 0 };" idiom, which makes developers' lives
-   inconvenient (as -Werror is enabled by DEVELOPER=YesPlease).  The
-   build procedure has been tweaked to help these compilers.
-
- * Plug memory leaks in the failure code path in the "merge-ort" merge
-   strategy backend.
-
- * "git symbolic-ref symref non..sen..se" is now diagnosed as an error.
-
- * A follow-up fix to a fix for a regression in 2.36 around hooks.
-
- * Avoid repeatedly running getconf to ask libc version in the test
-   suite, and instead just as it once per script.
-
- * Platform-specific code that determines if a directory is OK to use
-   as a repository has been taught to report more details, especially
-   on Windows.
-
- * "vimdiff3" regression fix.
-
- * "git fsck" reads mode from tree objects but canonicalizes the mode
-   before passing it to the logic to check object sanity, which has
-   hid broken tree objects from the checking logic.  This has been
-   corrected, but to help existing projects with broken tree objects
-   that they cannot fix retroactively, the severity of anomalies this
-   code detects has been demoted to "info" for now.
-
- * Fixes to sparse index compatibility work for "reset" and "checkout"
-   commands.
-
- * An earlier optimization discarded a tree-object buffer that is
-   still in use, which has been corrected.
-
- * Fix deadlocks between main Git process and subprocess spawned via
-   the pipe_command() API, that can kill "git add -p" that was
-   reimplemented in C recently.
-
- * The sequencer machinery translated messages left in the reflog by
-   mistake, which has been corrected.
-
- * xcalloc(), imitating calloc(), takes "number of elements of the
-   array", and "size of a single element", in this order.  A call that
-   does not follow this ordering has been corrected.
-
- * The preload-index codepath made copies of pathspec to give to
-   multiple threads, which were left leaked.
-
- * Update the version of Ubuntu used for GitHub Actions CI from 18.04
-   to 22.04.
-
- * The auto-stashed local changes created by "git merge --autostash"
-   was mixed into a conflicted state left in the working tree, which
-   has been corrected.
-
- * Multi-pack index got corrupted when preferred pack changed from one
-   pack to another in a certain way, which has been corrected.
-   (merge 99e4d084ff tb/midx-with-changing-preferred-pack-fix later to maint).
-
- * The clean-up of temporary files created via mks_tempfile_dt() was
-   racy and attempted to unlink() the leading directory when signals
-   are involved, which has been corrected.
-   (merge babe2e0559 rs/tempfile-cleanup-race-fix later to maint).
-
- * FreeBSD portability fix for "git maintenance" that spawns "crontab"
-   to schedule tasks.
-   (merge ee69e7884e bc/gc-crontab-fix later to maint).
-
- * Those who use diff-so-fancy as the diff-filter noticed a regression
-   or two in the code that parses the diff output in the built-in
-   version of "add -p", which has been corrected.
-   (merge 0a101676e5 js/add-p-diff-parsing-fix later to maint).
-
- * Segfault fix-up to an earlier fix to the topic to teach "git reset"
-   and "git checkout" work better in a sparse checkout.
-   (merge 037f8ea6d9 vd/sparse-reset-checkout-fixes later to maint).
-
- * "git diff --no-index A B" managed its the pathnames of its two
-   input files rather haphazardly, sometimes leaking them.  The
-   command line argument processing has been straightened out to clean
-   it up.
-   (merge 2b43dd0eb5 rs/diff-no-index-cleanup later to maint).
-
- * "git rev-list --verify-objects" ought to inspect the contents of
-   objects and notice corrupted ones, but it didn't when the commit
-   graph is in use, which has been corrected.
-   (merge b27ccae34b jk/rev-list-verify-objects-fix later to maint).
-
- * More fixes to "add -p"
-   (merge 64ec8efb83 js/builtin-add-p-portability-fix later to maint).
-
- * The parser in the script interface to parse-options in "git
-   rev-parse" has been updated to diagnose a bogus input correctly.
-   (merge f20b9c36d0 ow/rev-parse-parseopt-fix later to maint).
-
- * The code that manages list-object-filter structure, used in partial
-   clones, leaked the instances, which has been plugged.
-   (merge 66eede4a37 jk/plug-list-object-filter-leaks later to maint).
-
- * Fix another UI regression in the reimplemented "add -p".
-   (merge f6f0ee247f rs/add-p-worktree-mode-prompt-fix later to maint).
-
- * "git fetch" over protocol v2 sent an incorrect ref prefix request
-   to the server and made "git pull" with configured fetch refspec
-   that does not cover the remote branch to merge with fail, which has
-   been corrected.
-   (merge 49ca2fba39 jk/proto-v2-ref-prefix-fix later to maint).
-
- * A result from opendir() was leaking in the commit-graph expiration
-   codepath, which has been plugged.
-   (merge 12f1ae5324 ml/commit-graph-expire-dir-leak-fix later to maint).
-
- * Just like we have coding guidelines, we now have guidelines for
-   reviewers.
-   (merge e01b851923 vd/doc-reviewing-guidelines later to maint).
-
- * Other code cleanup, docfix, build fix, etc.
-   (merge 77b9e85c0f vd/fix-perf-tests later to maint).
-   (merge 0682bc43f5 jk/test-crontab-fixes later to maint).
-   (merge b46dd1726c cc/doc-trailer-whitespace-rules later to maint).

Documentation/RelNotes/2.38.1.txt

@@ -1,5 +0,0 @@
-Git v2.38.1 Release Notes
-=========================
-
-This release merges the security fix that appears in v2.30.6; see
-the release notes for that version for details.

Documentation/RelNotes/2.38.2.txt

@@ -1,67 +0,0 @@
-Git 2.38.2 Release Notes
-========================
-
-This is to backport various fixes accumulated during the development
-towards Git 2.39, the next feature release.
-
-
-Fixes since v2.38.1
--------------------
-
- * Update CodingGuidelines to clarify what features to use and avoid
-   in C99.
-
- * The codepath that reads from the index v4 had unaligned memory
-   accesses, which has been corrected.
-
- * "git remote rename" failed to rename a remote without fetch
-   refspec, which has been corrected.
-
- * "git clone" did not like to see the "--bare" and the "--origin"
-   options used together without a good reason.
-
- * Fix messages incorrectly marked for translation.
-
- * "git fsck" failed to release contents of tree objects already used
-   from the memory, which has been fixed.
-
- * "git rebase -i" can mistakenly attempt to apply a fixup to a commit
-   itself, which has been corrected.
-
- * In read-only repositories, "git merge-tree" tried to come up with a
-   merge result tree object, which it failed (which is not wrong) and
-   led to a segfault (which is bad), which has been corrected.
-
- * Force C locale while running tests around httpd to make sure we can
-   find expected error messages in the log.
-
- * Fix a logic in "mailinfo -b" that miscomputed the length of a
-   substring, which lead to an out-of-bounds access.
-
- * The codepath to sign learned to report errors when it fails to read
-   from "ssh-keygen".
-
- * "GIT_EDITOR=: git branch --edit-description" resulted in failure,
-   which has been corrected.
-
- * Documentation on various Boolean GIT_* environment variables have
-   been clarified.
-
- * "git multi-pack-index repack/expire" used to repack unreachable
-   cruft into a new pack, which have been corrected.
-
- * The code to clean temporary object directories (used for
-   quarantine) tried to remove them inside its signal handler, which
-   was a no-no.
-
- * "git branch --edit-description" on an unborh branch misleadingly
-   said that no such branch exists, which has been corrected.
-
- * GitHub CI settings have been adjusted to recent reality, merging
-   and cherry-picking necessary topics that have been prepared for Git
-   2.39.
-
- * `git rebase --update-refs` would delete references when all `update-ref`
-   commands in the sequencer were removed, which has been corrected.
-
-Also contains various documentation updates and code clean-ups.

Documentation/RelNotes/2.38.3.txt

@@ -1,5 +0,0 @@
-Git v2.38.3 Release Notes
-=========================
-
-This release merges the security fix that appears in v2.30.7; see
-the release notes for that version for details.

Documentation/RelNotes/2.39.0.txt

@@ -1,346 +0,0 @@
-Git v2.39 Release Notes
-=======================
-
-UI, Workflows & Features
-------------------------
-
- * "git grep" learned to expand the sparse-index more lazily and on
-   demand in a sparse checkout.
-
- * By default, use of fsmonitor on a repository on networked
-   filesystem is disabled. Add knobs to make it workable on macOS.
-
- * After checking out a "branch" that is a symbolic-ref that points at
-   another branch, "git symbolic-ref HEAD" reports the underlying
-   branch, not the symbolic-ref the user gave checkout as argument.
-   The command learned the "--no-recurse" option to stop after
-   dereferencing a symbolic-ref only once.
-
- * "git branch --edit-description @{-1}" is now a way to edit branch
-   description of the branch you were on before switching to the
-   current branch.
-
- * "git merge-tree --stdin" is a new way to request a series of merges
-   and report the merge results.
-
- * "git shortlog" learned to group by the "format" string.
-
- * A new "--include-whitespace" option is added to "git patch-id", and
-   existing bugs in the internal patch-id logic that did not match
-   what "git patch-id" produces have been corrected.
-
- * Enable gc.cruftpacks by default for those who opt into
-   feature.experimental setting.
-
- * "git repack" learns to send cruft objects out of the way into
-   packfiles outside the repository.
-
- * 'scalar reconfigure -a' is taught to automatically remove
-   scalar.repo entires which no longer exist.
-
- * Redact headers from cURL's h2h3 module in GIT_CURL_VERBOSE and
-   others.
-
- * 'git maintenance register' is taught to write configuration to an
-   arbitrary path, and 'git for-each-repo' is taught to expand tilde
-   characters in paths.
-
- * When creating new notes, the template used to get a stray empty
-   newline, which has been removed.
-
- * "git receive-pack" used to use all the local refs as the boundary for
-   checking connectivity of the data "git push" sent, but now it uses
-   only the refs that it advertised to the pusher. In a repository with
-   the .hideRefs configuration, this reduces the resources needed to
-   perform the check.
-
- * With '--recurse-submodules=on-demand', all submodules are
-   recursively pushed.
-
-
-Performance, Internal Implementation, Development Support etc.
---------------------------------------------------------------
-
- * With a bit of header twiddling, use the native regexp library on
-   macOS instead of the compat/ one.
-
- * Prepare for GNU [ef]grep that throw warning of their uses.
-
- * Sources related to fuzz testing have been moved down to their own
-   directory.
-
- * Most credential helpers ignored unknown entries in a credential
-   description, but a few died upon seeing them.  The latter were
-   taught to ignore them, too
-
- * "scalar unregister" in a repository that is already been
-   unregistered reported an error.
-
- * Remove error detection from a function that fetches from promisor
-   remotes, and make it die when such a fetch fails to bring all the
-   requested objects, to give an early failure to various operations.
-
- * Update CodingGuidelines to clarify what features to use and avoid
-   in C99.
-
- * Avoid false-positive from LSan whose assumption may be broken with
-   higher optimization levels.
-
- * Enable address and undefined sanitizer tasks at GitHub Actions CI.
-
- * More UNUSED annotation to help using -Wunused option with the
-   compiler.
-   (merge 4b992f0a24 jk/unused-anno-more later to maint).
-
- * Rewrite a deep recursion in the skipping negotiator to use a loop
-   with on-heap prio queue to avoid stack wastage.
-
- * Add documentation for message IDs in fsck error messages.
-
- * Define the logical elements of a "bundle list", data structure to
-   store them in-core, format to transfer them, and code to parse
-   them.
-
- * The role the security mailing list plays in an embargoed release
-   has been documented.
-
- * Two new facilities, "timer" and "counter", are introduced to the
-   trace2 API.
-
- * Code simplification by using strvec_pushf() instead of building an
-   argument in a separate strbuf.
-
- * Make sure generated dependency file is stably sorted to help
-   developers debugging their build issues.
-
- * The glossary entries for "commit-graph file" and "reachability
-   bitmap" have been added.
-
- * Various tests exercising the transfer.credentialsInUrl
-   configuration are taught to avoid making requests which require
-   resolving localhost to reduce CI-flakiness.
-
- * A redundant diagnostic message is dropped from test_path_is_missing().
-
- * Simplify the run-command API.
-
- * Update the actions/github-script dependency in CI to avoid a
-   deprecation warning.
-
- * Progress on being able to initialize a rev_info struct with a
-   macro.
-
- * Add trace2 counters to the region to clear skip worktree bits in a
-   sparse checkout.
-
- * Modernize test script to avoid "test -f" and friends.
-
- * Avoid calling 'cache_tree_update()' when doing so would be
-   redundant.
-
- * Update the credential-cache documentation to provide a more
-   realistic example.
-
- * Makefile comments updates and reordering to clarify knobs used to
-   choose SHA implementations.
-
- * A design document for sparse-checkout's future directions has been
-   added.
-
- * Teach chainlint.pl to annotate the original test definition instead
-   of the token stream.
-
- * "make coccicheck" is time consuming. It has been made to run more
-   incrementally.
-
- * `parse_object()` has been hardened to check for the existence of a
-   suspected blob object.
-
- * The build procedure has been adjusted to GNUmake version 4.4, which
-   made some changes to how pattern rule with multiple targets are
-   handled.
-
-
-Fixes since v2.38
------------------
-
- * The codepath that reads from the index v4 had unaligned memory
-   accesses, which has been corrected.
-
- * Fix messages incorrectly marked for translation.
-
- * "git fsck" failed to release contents of tree objects already used
-   from the memory, which has been fixed.
-
- * "git clone" did not like to see the "--bare" and the "--origin"
-   options used together without a good reason.
-
- * "git remote rename" failed to rename a remote without fetch
-   refspec, which has been corrected.
-
- * Documentation on various Boolean GIT_* environment variables have
-   been clarified.
-
- * "git rebase -i" can mistakenly attempt to apply a fixup to a commit
-   itself, which has been corrected.
-
- * "git multi-pack-index repack/expire" used to repack unreachable
-   cruft into a new pack, which have been corrected.
-
- * In read-only repositories, "git merge-tree" tried to come up with a
-   merge result tree object, which it failed (which is not wrong) and
-   led to a segfault (which is bad), which has been corrected.
-
- * Force C locale while running tests around httpd to make sure we can
-   find expected error messages in the log.
-
- * Fix a logic in "mailinfo -b" that miscomputed the length of a
-   substring, which lead to an out-of-bounds access.
-
- * The codepath to sign learned to report errors when it fails to read
-   from "ssh-keygen".
-
- * Code clean-up that results in plugging a leak.
-
- * "GIT_EDITOR=: git branch --edit-description" resulted in failure,
-   which has been corrected.
-
- * The code to clean temporary object directories (used for
-   quarantine) tried to remove them inside its signal handler, which
-   was a no-no.
-
- * Update comment in the Makefile about the RUNTIME_PREFIX config knob.
-
- * Clarify that "the sentence after <area>: prefix does not begin with
-   a capital letter" rule applies only to the commit title.
-
- * "git branch --edit-description" on an unborn branch misleadingly
-   said that no such branch exists, which has been corrected.
-
- * Work around older clang that warns against C99 zero initialization
-   syntax for struct.
-
- * Giving "--invert-grep" and "--all-match" without "--grep" to the
-   "git log" command resulted in an attempt to access grep pattern
-   expression structure that has not been allocated, which has been
-   corrected.
-   (merge db84376f98 ab/grep-simplify-extended-expression later to maint).
-
- * "git diff rev^!" did not show combined diff to go to the rev from
-   its parents.
-   (merge a79c6b6081 rs/diff-caret-bang-with-parents later to maint).
-
- * Allow configuration files in "protected" scopes to include other
-   configuration files.
-   (merge ecec57b3c9 gc/bare-repo-discovery later to maint).
-
- * Give a bit more diversity to macOS CI by using sha1dc in one of the
-   jobs (the other one tests Apple Common Crypto).
-   (merge 1ad5c3df35 jc/ci-osx-with-sha1dc later to maint).
-
- * A bugfix with tracing support in midx codepath
-   (merge e9c3839944 tb/midx-bitmap-selection-fix later to maint).
-
- * When geometric repacking feature is in use together with the
-   --pack-kept-objects option, we lost packs marked with .keep files.
-   (merge 197443e80a tb/save-keep-pack-during-geometric-repack later to maint).
-
- * Move a global variable added as a hack during regression fixes to
-   its proper place in the API.
-   (merge 0b0ab95f17 ab/run-hook-api-cleanup later to maint).
-
- * Update to build procedure with VS using CMake/CTest.
-   (merge c858750b41 js/cmake-updates later to maint).
-
- * The short-help text shown by "git cmd -h" and the synopsis text
-   shown at the beginning of "git help cmd" have been made more
-   consistent.
-
- * When creating a multi-pack bitmap, remove per-pack bitmap files
-   unconditionally as they will never be consulted.
-   (merge 55d902cd61 tb/remove-unused-pack-bitmap later to maint).
-
- * Fix a longstanding syntax error in Git.pm error codepath.
-
- * "git diff --stat" etc. were invented back when everything was ASCII
-   and strlen() was a way to measure the display width of a string;
-   adjust them to compute the display width assuming UTF-8 pathnames.
-   (merge ce8529b2bb tb/diffstat-with-utf8-strwidth later to maint).
-
- * "git branch --edit-description" can exit with status -1 which is
-   not a good practice; it learned to use 1 as everybody else instead.
-
- * "git apply" limits its input to a bit less than 1 GiB.
-
- * Merging a branch with directory renames into a branch that changes
-   the directory to a symlink was mishandled by the ort merge
-   strategy, which has been corrected.
-
- * A bugfix to "git subtree" in its split and merge features.
-
- * Fix some bugs in the reflog messages when rebasing and changes the
-   reflog messages of "rebase --apply" to match "rebase --merge" with
-   the aim of making the reflog easier to parse.
-
- * "git rebase --keep-base" used to discard the commits that are
-   already cherry-picked to the upstream, even when "keep-base" meant
-   that the base, on top of which the history is being rebuilt, does
-   not yet include these cherry-picked commits.  The --keep-base
-   option now implies --reapply-cherry-picks and --no-fork-point
-   options.
-
- * The way "git repack" created temporary files when it received a
-   signal was prone to deadlocking, which has been corrected.
-
- * Various tests exercising the transfer.credentialsInUrl
-   configuration are taught to avoid making requests which require
-   resolving localhost to reduce CI-flakiness.
-
- * The adjust_shared_perm() helper function learned to refrain from
-   setting the "g+s" bit on directories when it is not necessary.
-
- * "git archive" mistakenly complained twice about a missing
-   executable, which has been corrected.
-
- * Fix a bug where `git branch -d` did not work on an orphaned HEAD.
-
- * `git rebase --update-refs` would delete references when all
-   `update-ref` commands in the sequencer were removed, which has been
-   corrected.
-
- * Fix a regression in the bisect-helper which mistakenly treats
-   arguments to the command given to 'git bisect run' as arguments to
-   the helper.
-
- * Correct an error where `git rebase` would mistakenly use a branch or
-   tag named "refs/rewritten/xyz" when missing a rebase label.
-
- * Assorted fixes of parsing end-user input as integers.
-   (merge 14770cf0de pw/config-int-parse-fixes later to maint).
-
- * "git prune" may try to iterate over .git/objects/pack for trash
-   files to remove in it, and loudly fail when the directory is
-   missing, which is not necessary.  The command has been taught to
-   ignore such a failure.
-   (merge 6974765352 ew/prune-with-missing-objects-pack later to maint).
-
- * Add one more candidate directory that may house httpd modules while
-   running tests.
-   (merge 1c7dc23d41 es/locate-httpd-module-location-in-test later to maint).
-
- * A handful of leaks in the line-log machinery have been plugged.
-
- * The format of a line in /proc/cpuinfo that describes a CPU on s390x
-   looked different from everybody else, and the code in chainlint.pl
-   failed to parse it.
-   (merge 1f51b77f4f ah/chainlint-cpuinfo-parse-fix later to maint).
-
- * Adjust the GitHub CI to newer ubuntu release.
-   (merge 0d3507f3e7 jx/ci-ubuntu-fix later to maint).
-
- * Other code cleanup, docfix, build fix, etc.
-   (merge 413bc6d20a ds/cmd-main-reorder later to maint).
-   (merge 8d2863e4ed nw/t1002-cleanup later to maint).
-   (merge 7c2dc122f9 rs/list-objects-filter-leakfix later to maint).
-   (merge 288fcb1c94 zk/push-use-bitmaps later to maint).
-   (merge 42db324c0f km/merge-recursive-typofix later to maint).

Documentation/RelNotes/2.39.1.txt

@@ -1,5 +0,0 @@
-Git v2.39.1 Release Notes
-=========================
-
-This release merges the security fix that appears in v2.30.7; see
-the release notes for that version for details.

Documentation/ReviewingGuidelines.txt

@@ -1,162 +0,0 @@
-Reviewing Patches in the Git Project
-====================================
-
-Introduction
-------------
-The Git development community is a widely distributed, diverse, ever-changing
-group of individuals. Asynchronous communication via the Git mailing list poses
-unique challenges when reviewing or discussing patches. This document contains
-some guiding principles and helpful tools you can use to make your reviews both
-more efficient for yourself and more effective for other contributors.
-
-Note that none of the recommendations here are binding or in any way a
-requirement of participation in the Git community. They are provided as a
-resource to supplement your skills as a contributor.
-
-Principles
-----------
-
-Selecting patch(es) to review
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If you are looking for a patch series in need of review, start by checking
-latest "What's cooking in git.git" email
-(https://lore.kernel.org/git/xmqqilm1yp3m.fsf@gitster.g/[example]). The "What's
-cooking" emails & replies can be found using the query `s:"What's cooking"` on
-the https://lore.kernel.org/git/[`lore.kernel.org` mailing list archive];
-alternatively, you can find the contents of the "What's cooking" email tracked
-in `whats-cooking.txt` on the `todo` branch of Git. Topics tagged with "Needs
-review" and those in the "[New Topics]" section are typically those that would
-benefit the most from additional review.
-
-Patches can also be searched manually in the mailing list archive using a query
-like `s:"PATCH" -s:"Re:"`. You can browse these results for topics relevant to
-your expertise or interest.
-
-If you've already contributed to Git, you may also be CC'd in another
-contributor's patch series. These are topics where the author feels that your
-attention is warranted. This may be because their patch changes something you
-wrote previously (making you a good judge of whether the new approach does or
-doesn't work), or because you have the expertise to provide an exceptionally
-helpful review. There is no requirement to review these patches but, in the
-spirit of open source collaboration, you should strongly consider doing so.
-
-Reviewing patches
-~~~~~~~~~~~~~~~~~
-While every contributor takes their own approach to reviewing patches, here are
-some general pieces of advice to make your reviews as clear and helpful as
-possible. The advice is broken into two rough categories: high-level reviewing
-guidance, and concrete tips for interacting with patches on the mailing list.
-
-==== High-level guidance
-- Remember to review the content of commit messages for correctness and clarity,
-  in addition to the code change in the patch's diff. The commit message of a
-  patch should accurately and fully explain the code change being made in the
-  diff.
-
-- Reviewing test coverage is an important - but easy to overlook - component of
-  reviews. A patch's changes may be covered by existing tests, or new tests may
-  be introduced to exercise new behavior. Checking out a patch or series locally
-  allows you to manually mutate lines of new & existing tests to verify expected
-  pass/fail behavior. You can use this information to verify proper coverage or
-  to suggest additional tests the author could add.
-
-- When providing a recommendation, be as clear as possible about whether you
-  consider it "blocking" (the code would be broken or otherwise made worse if an
-  issue isn't fixed) or "non-blocking" (the patch could be made better by taking
-  the recommendation, but acceptance of the series does not require it).
-  Non-blocking recommendations can be particularly ambiguous when they are
-  related to - but outside the scope of - a series ("nice-to-have"s), or when
-  they represent only stylistic differences between the author and reviewer.
-
-- When commenting on an issue, try to include suggestions for how the author
-  could fix it. This not only helps the author to understand and fix the issue,
-  it also deepens and improves your understanding of the topic.
-
-- Reviews do not need to exclusively point out problems. Feel free to "think out
-  loud" in your review: describe how you read & understood a complex section of
-  a patch, ask a question about something that confused you, point out something
-  you found exceptionally well-written, etc. In particular, uplifting feedback
-  goes a long way towards encouraging contributors to participate more actively
-  in the Git community.
-
-==== Performing your review
-- Provide your review comments per-patch in a plaintext "Reply-All" email to the
-  relevant patch. Comments should be made inline, immediately below the relevant
-  section(s).
-
-- You may find that the limited context provided in the patch diff is sometimes
-  insufficient for a thorough review. In such cases, you can review patches in
-  your local tree by either applying patches with linkgit:git-am[1] or checking
-  out the associated branch from https://github.com/gitster/git once the series
-  is tracked there.
-
-- Large, complicated patch diffs are sometimes unavoidable, such as when they
-  refactor existing code. If you find such a patch difficult to parse, try
-  reviewing the diff produced with the `--color-moved` and/or
-  `--ignore-space-change` options.
-
-- If a patch is long, you are encouraged to delete parts of it that are
-  unrelated to your review from the email reply. Make sure to leave enough
-  context for readers to understand your comments!
-
-- If you cannot complete a full review of a series all at once, consider letting
-  the author know (on- or off-list) if/when you plan to review the rest of the
-  series.
-
-Completing a review
-~~~~~~~~~~~~~~~~~~~
-Once each patch of a series is reviewed, the author (and/or other contributors)
-may discuss the review(s). This may result in no changes being applied, or the
-author will send a new version of their patch(es).
-
-After a series is rerolled in response to your or others' review, make sure to
-re-review the updates. If you are happy with the state of the patch series,
-explicitly indicate your approval (typically with a reply to the latest
-version's cover letter). Optionally, you can let the author know that they can
-add a "Reviewed-by: <you>" trailer if they resubmit the reviewed patch verbatim
-in a later iteration of the series.
-
-Finally, subsequent "What's cooking" emails may explicitly ask whether a
-reviewed topic is ready for merging to the `next` branch (typically phrased
-"Will merge to \'next\'?"). You can help the maintainer and author by responding
-with a short description of the state of your (and others', if applicable)
-review, including the links to the relevant thread(s).
-
-Terminology
------------
-nit: ::
-	Denotes a small issue that should be fixed, such as a typographical error
-	or mis-alignment of conditions in an `if()` statement.
-
-aside: ::
-optional: ::
-non-blocking: ::
-	Indicates to the reader that the following comment should not block the
-	acceptance of the patch or series. These are typically recommendations
-	related to code organization & style, or musings about topics related to
-	the patch in question, but beyond its scope.
-
-s/<before>/<after>/::
-	Shorthand for "you wrote <before>, but I think you meant <after>," usually
-	for misspellings or other typographical errors. The syntax is a reference
-	to "substitute" command commonly found in Unix tools such as `ed`, `sed`,
-	`vim`, and `perl`.
-
-cover letter::
-	The "Patch 0" of a multi-patch series. This email describes the
-	high-level intent and structure of the patch series to readers on the
-	Git mailing list. It is also where the changelog notes and range-diff of
-	subsequent versions are provided by the author.
-+
-On single-patch submissions, cover letter content is typically not sent as a
-separate email. Instead, it is inserted between the end of the patch's commit
-message (after the `---`) and the beginning of the diff.
-
-#leftoverbits::
-  Used by either an author or a reviewer to describe features or suggested
-  changes that are out-of-scope of a given patch or series, but are relevant
-  to the topic for the sake of discussion.
-
-See Also
---------
-link:MyFirstContribution.html[MyFirstContribution]

Documentation/SubmittingPatches

@@ -153,9 +153,7 @@ 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 (the omission
-of capitalization applies only to the word after the "area:"
-prefix of the title) unless there is a reason to
+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

Documentation/ToolsForGit.txt

@@ -1,51 +0,0 @@
-Tools for developing Git
-========================
-:sectanchors:
-
-[[summary]]
-== Summary
-
-This document gathers tips, scripts and configuration file to help people
-working on Git's codebase use their favorite tools while following Git's
-coding style.
-
-[[author]]
-=== Author
-
-The Git community.
-
-[[table_of_contents]]
-== Table of contents
-
-- <<vscode>>
-- <<emacs>>
-
-[[vscode]]
-=== Visual Studio Code (VS Code)
-
-The contrib/vscode/init.sh script creates configuration files that enable
-several valuable VS Code features. See contrib/vscode/README.md for more
-information on using the script.
-
-[[emacs]]
-=== Emacs
-
-This is adapted from Linux's suggestion in its CodingStyle document:
-
-- To follow rules of the CodingGuideline, it's useful to put the following in
-GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode:
-----
-;; note the first part is useful for C editing, too
-((nil . ((indent-tabs-mode . t)
-	 (tab-width . 8)
-	 (fill-column . 80)))
-	 (cperl-mode . ((cperl-indent-level . 8)
-			(cperl-extra-newline-before-brace . nil)
-			(cperl-merge-trailing-else . t))))
-----
-
-For a more complete setup, since Git's codebase uses a coding style
-similar to the Linux kernel's style, tips given in Linux's CodingStyle
-document can be applied here too.
-
-==== https://www.kernel.org/doc/html/v4.10/process/coding-style.html#you-ve-made-a-mess-of-it

Documentation/build-docdep.perl

@@ -38,10 +38,9 @@ while ($changed) {
     }
 }
 
-foreach my $text (sort keys %include) {
-    my $included = $include{$text};
+while (my ($text, $included) = each %include) {
     if (! exists $included{$text} &&
 	(my $base = $text) =~ s/\.txt$//) {
-	print "$base.html $base.xml : ", join(" ", sort keys %$included), "\n";
+	print "$base.html $base.xml : ", join(" ", keys %$included), "\n";
     }
 }

Documentation/cmd-list.perl

@@ -10,7 +10,7 @@ sub format_one {
 	$state = 0;
 	open I, '<', "$name.txt" or die "No such file $name.txt";
 	while (<I>) {
-		if (/^(?:git|scalar)[a-z0-9-]*\(([0-9])\)$/) {
+		if (/^git[a-z0-9-]*\(([0-9])\)$/) {
 			$mansection = $1;
 			next;
 		}

Documentation/config.txt

@@ -387,8 +387,6 @@ include::config/branch.txt[]
 
 include::config/browser.txt[]
 
-include::config/bundle.txt[]
-
 include::config/checkout.txt[]
 
 include::config/clean.txt[]
@@ -425,8 +423,6 @@ include::config/filter.txt[]
 
 include::config/fsck.txt[]
 
-include::config/fsmonitor--daemon.txt[]
-
 include::config/gc.txt[]
 
 include::config/gitcvs.txt[]
@@ -449,8 +445,6 @@ include::config/i18n.txt[]
 
 include::config/imap.txt[]
 
-include::config/includeif.txt[]
-
 include::config/index.txt[]
 
 include::config/init.txt[]
@@ -501,8 +495,6 @@ include::config/repack.txt[]
 
 include::config/rerere.txt[]
 
-include::config/revert.txt[]
-
 include::config/safe.txt[]
 
 include::config/sendemail.txt[]

Documentation/config/add.txt

@@ -7,6 +7,6 @@ add.ignore-errors (deprecated)::
 	variables.
 
 add.interactive.useBuiltin::
-	Set to `false` to fall back to the original Perl implementation of
-	the interactive version of linkgit:git-add[1] instead of the built-in
-	version. Is `true` by default.
+	[EXPERIMENTAL] Set to `true` to use the experimental built-in
+	implementation of the interactive version of linkgit:git-add[1]
+	instead of the Perl script version. Is `false` by default.

Documentation/config/branch.txt

@@ -9,9 +9,7 @@ branch.autoSetupMerge::
 	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
-	branch; `simple` -- automatic setup is done only when the starting point
-	is a remote-tracking branch and the new branch has the same name as the
-	remote branch. This option defaults to true.
+	branch. This option defaults to true.
 
 branch.autoSetupRebase::
 	When a new branch is created with 'git branch', 'git switch' or 'git checkout'
@@ -40,9 +38,8 @@ branch.<name>.remote::
 	may be overridden with `remote.pushDefault` (for all branches).
 	The remote to push to, for the current branch, may be further
 	overridden by `branch.<name>.pushRemote`.  If no remote is
-	configured, or if you are not on any branch and there is more than
-	one remote defined in the repository, it defaults to `origin` for
-	fetching and `remote.pushDefault` for pushing.
+	configured, or if you are not on any branch, it defaults to
+	`origin` for fetching and `remote.pushDefault` for pushing.
 	Additionally, `.` (a period) is the current local repository
 	(a dot-repository), see `branch.<name>.merge`'s final note below.
 

Documentation/config/bundle.txt

@@ -1,24 +0,0 @@
-bundle.*::
-	The `bundle.*` keys may appear in a bundle list file found via the
-	`git clone --bundle-uri` option. These keys currently have no effect
-	if placed in a repository config file, though this will change in the
-	future. See link:technical/bundle-uri.html[the bundle URI design
-	document] for more details.
-
-bundle.version::
-	This integer value advertises the version of the bundle list format
-	used by the bundle list. Currently, the only accepted value is `1`.
-
-bundle.mode::
-	This string value should be either `all` or `any`. This value describes
-	whether all of the advertised bundles are required to unbundle a
-	complete understanding of the bundled information (`all`) or if any one
-	of the listed bundle URIs is sufficient (`any`).
-
-bundle.<id>.*::
-	The `bundle.<id>.*` keys are used to describe a single item in the
-	bundle list, grouped under `<id>` for identification purposes.
-
-bundle.<id>.uri::
-	This string value defines the URI by which Git can reach the contents
-	of this `<id>`. This URI may be a bundle file or another bundle list.

Documentation/config/core.txt

@@ -444,32 +444,17 @@ You probably do not need to adjust this value.
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
 core.bigFileThreshold::
-	The size of files considered "big", which as discussed below
-	changes the behavior of numerous git commands, as well as how
-	such files are stored within the repository. The default is
-	512 MiB. Common unit suffixes of 'k', 'm', or 'g' are
-	supported.
+	Files larger than this size are stored deflated, without
+	attempting delta compression.  Storing large files without
+	delta compression avoids excessive memory usage, at the
+	slight expense of increased disk usage. Additionally files
+	larger than this size are always treated as binary.
 +
-Files above the configured limit will be:
+Default is 512 MiB on all platforms.  This should be reasonable
+for most projects as source code and other text files can still
+be delta compressed, but larger binary media files won't be.
 +
-* Stored deflated in packfiles, without attempting delta compression.
-+
-The default limit is primarily set with this use-case in mind. With it,
-most projects will have their source code and other text files delta
-compressed, but not larger binary media files.
-+
-Storing large files without delta compression avoids excessive memory
-usage, at the slight expense of increased disk usage.
-+
-* Will be treated as if they were labeled "binary" (see
-  linkgit:gitattributes[5]). e.g. linkgit:git-log[1] and
-  linkgit:git-diff[1] will not compute diffs for files above this limit.
-+
-* Will generally be streamed when written, which avoids excessive
-memory usage, at the cost of some fixed overhead. Commands that make
-use of this include linkgit:git-archive[1],
-linkgit:git-fast-import[1], linkgit:git-index-pack[1],
-linkgit:git-unpack-objects[1] and linkgit:git-fsck[1].
+Common unit suffixes of 'k', 'm', or 'g' are supported.
 
 core.excludesFile::
 	Specifies the pathname to the file that contains patterns to
@@ -618,7 +603,7 @@ but risks losing recent work in the event of an unclean system shutdown.
 * `loose-object` hardens objects added to the repo in loose-object form.
 * `pack` hardens objects added to the repo in packfile form.
 * `pack-metadata` hardens packfile bitmaps and indexes.
-* `commit-graph` hardens the commit-graph file.
+* `commit-graph` hardens the commit graph file.
 * `index` hardens the index when it is modified.
 * `objects` is an aggregate option that is equivalent to
   `loose-object,pack`.
@@ -643,14 +628,6 @@ core.fsyncMethod::
 * `writeout-only` issues pagecache writeback requests, but depending on the
   filesystem and storage hardware, data added to the repository may not be
   durable in the event of a system crash. This is the default mode on macOS.
-* `batch` enables a mode that uses writeout-only flushes to stage multiple
-  updates in the disk writeback cache and then does a single full fsync of
-  a dummy file to trigger the disk cache flush at the end of the operation.
-+
-Currently `batch` mode only applies to loose-object files. Other repository
-data is made durable as if `fsync` was specified. This mode is expected to
-be as safe as `fsync` on macOS for repos stored on HFS+ or APFS filesystems
-and on Windows for repos stored on NTFS or ReFS filesystems.
 
 core.fsyncObjectFiles::
 	This boolean will enable 'fsync()' when writing object files.
@@ -721,10 +698,8 @@ core.sparseCheckout::
 
 core.sparseCheckoutCone::
 	Enables the "cone mode" of the sparse checkout feature. When the
-	sparse-checkout file contains a limited set of patterns, this
-	mode provides significant performance advantages. The "non-cone
-	mode" can be requested to allow specifying more flexible
-	patterns by setting this variable to 'false'. See
+	sparse-checkout file contains a limited set of patterns, then this
+	mode provides significant performance advantages. See
 	linkgit:git-sparse-checkout[1] for more information.
 
 core.abbrev::

Documentation/config/diff.txt

@@ -178,6 +178,21 @@ diff.<driver>.cachetextconv::
 	Set this option to true to make the diff driver cache the text
 	conversion outputs.  See linkgit:gitattributes[5] for details.
 
+diff.tool::
+	Controls which diff tool is used by linkgit:git-difftool[1].
+	This variable overrides the value configured in `merge.tool`.
+	The list below shows the valid built-in values.
+	Any other value is treated as a custom diff tool and requires
+	that a corresponding difftool.<tool>.cmd variable is defined.
+
+diff.guitool::
+	Controls which diff tool is used by linkgit:git-difftool[1] when
+	the -g/--gui flag is specified. This variable overrides the value
+	configured in `merge.guitool`. The list below shows the valid
+	built-in values. Any other value is treated as a custom diff tool
+	and requires that a corresponding difftool.<guitool>.cmd variable
+	is defined.
+
 include::../mergetools-diff.txt[]
 
 diff.indentHeuristic::

Documentation/config/difftool.txt

@@ -1,17 +1,6 @@
-diff.tool::
-	Controls which diff tool is used by linkgit:git-difftool[1].
-	This variable overrides the value configured in `merge.tool`.
-	The list below shows the valid built-in values.
-	Any other value is treated as a custom diff tool and requires
-	that a corresponding difftool.<tool>.cmd variable is defined.
-
-diff.guitool::
-	Controls which diff tool is used by linkgit:git-difftool[1] when
-	the -g/--gui flag is specified. This variable overrides the value
-	configured in `merge.guitool`. The list below shows the valid
-	built-in values. Any other value is treated as a custom diff tool
-	and requires that a corresponding difftool.<guitool>.cmd variable
-	is defined.
+difftool.<tool>.path::
+	Override the path for the given tool.  This is useful in case
+	your tool is not in the PATH.
 
 difftool.<tool>.cmd::
 	Specify the command to invoke the specified diff tool.
@@ -20,17 +9,6 @@ difftool.<tool>.cmd::
 	file containing the contents of the diff pre-image and 'REMOTE'
 	is set to the name of the temporary file containing the contents
 	of the diff post-image.
-+
-See the `--tool=<tool>` option in linkgit:git-difftool[1] for more details.
-
-difftool.<tool>.path::
-	Override the path for the given tool.  This is useful in case
-	your tool is not in the PATH.
-
-difftool.trustExitCode::
-	Exit difftool if the invoked diff tool returns a non-zero exit status.
-+
-See the `--trust-exit-code` option in linkgit:git-difftool[1] for more details.
 
 difftool.prompt::
 	Prompt before each invocation of the diff tool.

Documentation/config/feature.txt

@@ -14,9 +14,6 @@ feature.experimental::
 +
 * `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
 skipping more commits at a time, reducing the number of round trips.
-+
-* `gc.cruftPacks=true` reduces disk space used by unreachable objects during
-garbage collection, preventing loose object explosions.
 
 feature.manyFiles::
 	Enable config options that optimize for repos with many files in the

Documentation/config/format.txt

@@ -15,10 +15,6 @@ format.from::
 	different.  If set to a non-boolean value, format-patch uses that
 	value instead of your committer identity.  Defaults to false.
 
-format.forceInBodyFrom::
-	Provides the default value for the `--[no-]force-in-body-from`
-	option to format-patch.  Defaults to false.
-
 format.numbered::
 	A boolean which can enable or disable sequence numbers in patch
 	subjects.  It defaults to "auto" which enables it only if there

Documentation/config/fsck.txt

@@ -35,10 +35,6 @@ allow new instances of the same breakages go unnoticed.
 Setting an unknown `fsck.<msg-id>` value will cause fsck to die, but
 doing the same for `receive.fsck.<msg-id>` and `fetch.fsck.<msg-id>`
 will only cause git to warn.
-+
-See `Fsck Messages` section of linkgit:git-fsck[1] for supported
-values of `<msg-id>`.
-
 
 fsck.skipList::
 	The path to a list of object names (i.e. one unabbreviated SHA-1 per

Documentation/config/fsmonitor--daemon.txt

@@ -1,11 +0,0 @@
-fsmonitor.allowRemote::
-    By default, the fsmonitor daemon refuses to work against network-mounted
-    repositories. Setting `fsmonitor.allowRemote` to `true` overrides this
-    behavior.  Only respected when `core.fsmonitor` is set to `true`.
-
-fsmonitor.socketDir::
-    This Mac OS-specific option, if set, specifies the directory in
-    which to create the Unix domain socket used for communication
-    between the fsmonitor daemon and various Git commands. The directory must
-    reside on a native Mac OS filesystem.  Only respected when `core.fsmonitor`
-    is set to `true`.

Documentation/config/gc.txt

@@ -81,21 +81,14 @@ gc.packRefs::
 	to enable it within all non-bare repos or it can be set to a
 	boolean value.  The default is `true`.
 
-gc.cruftPacks::
-	Store unreachable objects in a cruft pack (see
-	linkgit:git-repack[1]) instead of as loose objects. The default
-	is `false`.
-
 gc.pruneExpire::
-	When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'
-	(and 'repack --cruft --cruft-expiration 2.weeks.ago' if using
-	cruft packs via `gc.cruftPacks` or `--cruft`).  Override the
-	grace period with this config variable.  The value "now" may be
-	used to disable this grace period and always prune unreachable
-	objects immediately, or "never" may be used to suppress pruning.
-	This feature helps prevent corruption when 'git gc' runs
-	concurrently with another process writing to the repository; see
-	the "NOTES" section of linkgit:git-gc[1].
+	When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
+	Override the grace period with this config variable.  The value
+	"now" may be used to disable this grace period and always prune
+	unreachable objects immediately, or "never" may be used to
+	suppress pruning.  This feature helps prevent corruption when
+	'git gc' runs concurrently with another process writing to the
+	repository; see the "NOTES" section of linkgit:git-gc[1].
 
 gc.worktreePruneExpire::
 	When 'git gc' is run, it calls

Documentation/config/gpg.txt

@@ -36,12 +36,9 @@ gpg.minTrustLevel::
 
 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
-	prefixed with `key::` is expected in the first line of its output.
-	This allows for a script doing a dynamic lookup of the correct public
-	key when it is impractical to statically configure `user.signingKey`.
-	For example when keys or SSH Certificates are rotated frequently or
-	selection of the right key depends on external factors unknown to git.
+	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.

Documentation/config/grep.txt

@@ -17,11 +17,8 @@ grep.extendedRegexp::
 	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.
+	Number of grep worker threads to use.
+	See `grep.threads` in linkgit:git-grep[1] for more information.
 
 grep.fallbackToNoIndex::
 	If set to true, fall back to git grep --no-index if git grep

Documentation/config/http.txt

@@ -98,22 +98,6 @@ http.version::
 	- HTTP/2
 	- HTTP/1.1
 
-http.curloptResolve::
-	Hostname resolution information that will be used first by
-	libcurl when sending HTTP requests.  This information should
-	be in one of the following formats:
-
-	- [+]HOST:PORT:ADDRESS[,ADDRESS]
-	- -HOST:PORT
-
-+
-The first format redirects all requests to the given `HOST:PORT`
-to the provided `ADDRESS`(s). The second format clears all
-previous config values for that `HOST:PORT` combination.  To
-allow easy overriding of all the settings inherited from the
-system config, an empty value will reset all resolution
-information to the empty list.
-
 http.sslVersion::
 	The SSL version to use when negotiating an SSL connection, if you
 	want to force the default.  The available and default version
@@ -203,7 +187,7 @@ http.schannelUseSSLCAInfo::
 	when the `schannel` backend was configured via `http.sslBackend`,
 	unless `http.schannelUseSSLCAInfo` overrides this behavior.
 
-http.pinnedPubkey::
+http.pinnedpubkey::
 	Public key of the https service. It may either be the filename of
 	a PEM or DER encoded public key file or a string starting with
 	'sha256//' followed by the base64 encoded sha256 hash of the

Documentation/config/includeif.txt

@@ -1,6 +0,0 @@
-include.path::
-includeIf.<condition>.path::
-	Special variables to include other configuration files. See
-	the "CONFIGURATION FILE" section in the main
-	linkgit:git-config[1] documentation,
-	specifically the "Includes" and "Conditional Includes" subsections.

Documentation/config/log.txt

@@ -7,10 +7,6 @@ log.date::
 	Set the default date-time mode for the 'log' command.
 	Setting a value for log.date is similar to using 'git log''s
 	`--date` option.  See linkgit:git-log[1] for details.
-+
-If the format is set to "auto:foo" and the pager is in use, format
-"foo" will be the used for the date format. Otherwise "default" will
-be used.
 
 log.decorate::
 	Print out the ref names of any commits that are shown by the log
@@ -22,11 +18,6 @@ log.decorate::
 	names are shown. This is the same as the `--decorate` option
 	of the `git log`.
 
-log.initialDecorationSet::
-	By default, `git log` only shows decorations for certain known ref
-	namespaces. If 'all' is specified, then show all refs as
-	decorations.
-
 log.excludeDecoration::
 	Exclude the specified patterns from the log decorations. This is
 	similar to the `--decorate-refs-exclude` command-line option, but
@@ -34,9 +25,9 @@ log.excludeDecoration::
 	option.
 
 log.diffMerges::
-	Set diff format to be used when `--diff-merges=on` is
-	specified, see `--diff-merges` in linkgit:git-log[1] for
-	details. Defaults to `separate`.
+	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

Documentation/config/lsrefs.txt

@@ -1,7 +1,7 @@
 lsrefs.unborn::
 	May be "advertise" (the default), "allow", or "ignore". If "advertise",
 	the server will respond to the client sending "unborn" (as described in
-	linkgit:gitprotocol-v2[5]) and will advertise support for this feature during the
+	protocol-v2.txt) and will advertise support for this feature during the
 	protocol v2 capability advertisement. "allow" is the same as
 	"advertise" except that the server will not advertise support for this
 	feature; this is useful for load-balanced servers that cannot be

Documentation/config/mergetool.txt

@@ -45,21 +45,12 @@ mergetool.meld.useAutoMerge::
 	value of `false` avoids using `--auto-merge` altogether, and is the
 	default value.
 
-mergetool.vimdiff.layout::
-	The vimdiff backend uses this variable to control how its split
-	windows look like. Applies even if you are using Neovim (`nvim`) or
-	gVim (`gvim`) as the merge tool. See BACKEND SPECIFIC HINTS section
-ifndef::git-mergetool[]
-	in linkgit:git-mergetool[1].
-endif::[]
-	for details.
-
 mergetool.hideResolved::
 	During a merge Git will automatically resolve as many conflicts as
 	possible and write the 'MERGED' file containing conflict markers around
 	any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
 	represent the versions of the file from before Git's conflict
-	resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwritten so
+	resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
 	that only the unresolved conflicts are presented to the merge tool. Can
 	be configured per-tool via the `mergetool.<tool>.hideResolved`
 	configuration variable. Defaults to `false`.

Documentation/config/notes.txt

@@ -3,9 +3,6 @@ notes.mergeStrategy::
 	conflicts.  Must be one of `manual`, `ours`, `theirs`, `union`, or
 	`cat_sort_uniq`.  Defaults to `manual`.  See "NOTES MERGE STRATEGIES"
 	section of linkgit:git-notes[1] for more information on each strategy.
-+
-This setting can be overridden by passing the `--strategy` option to
-linkgit:git-notes[1].
 
 notes.<name>.mergeStrategy::
 	Which merge strategy to choose when doing a notes merge into
@@ -14,35 +11,28 @@ notes.<name>.mergeStrategy::
 	linkgit:git-notes[1] for more information on the available strategies.
 
 notes.displayRef::
-	Which ref (or refs, if a glob or specified more than once), in
-	addition to the default set by `core.notesRef` or
-	`GIT_NOTES_REF`, to read notes from when showing commit
-	messages with the 'git log' family of commands.
+	The (fully qualified) refname from which to show notes when
+	showing commit messages.  The value of this variable can be set
+	to a glob, in which case notes from all matching refs will be
+	shown.  You may also specify this configuration variable
+	several times.  A warning will be issued for refs that do not
+	exist, but a glob that does not match any refs is silently
+	ignored.
 +
 This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
 environment variable, which must be a colon separated list of refs or
 globs.
 +
-A warning will be issued for refs that do not exist,
-but a glob that does not match any refs is silently ignored.
-+
-This setting can be disabled by the `--no-notes` option to the 'git
-log' family of commands, or by the `--notes=<ref>` option accepted by
-those commands.
-+
 The effective value of "core.notesRef" (possibly overridden by
 GIT_NOTES_REF) is also implicitly added to the list of refs to be
 displayed.
 
 notes.rewrite.<command>::
 	When rewriting commits with <command> (currently `amend` or
-	`rebase`), if this variable is `false`, git will not copy
-	notes from the original to the rewritten commit.  Defaults to
-	`true`.  See also "`notes.rewriteRef`" below.
-+
-This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
-environment variable, which must be a colon separated list of refs or
-globs.
+	`rebase`) and this variable is set to `true`, Git
+	automatically copies your notes from the original to the
+	rewritten commit.  Defaults to `true`, but see
+	"notes.rewriteRef" below.
 
 notes.rewriteMode::
 	When copying notes during a rewrite (see the
@@ -56,13 +46,14 @@ environment variable.
 
 notes.rewriteRef::
 	When copying notes during a rewrite, specifies the (fully
-	qualified) ref whose notes should be copied.  May be a glob,
-	in which case notes in all matching refs will be copied.  You
-	may also specify this configuration several times.
+	qualified) ref whose notes should be copied.  The ref may be a
+	glob, in which case notes in all matching refs will be copied.
+	You may also specify this configuration several times.
 +
 Does not have a default value; you must configure this variable to
 enable note rewriting.  Set it to `refs/notes/commits` to enable
 rewriting for the default commit notes.
 +
-Can be overridden with the `GIT_NOTES_REWRITE_REF` environment variable.
-See `notes.rewrite.<command>` above for a further description of its format.
+This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
+environment variable, which must be a colon separated list of refs or
+globs.

Documentation/config/pack.txt

@@ -164,16 +164,9 @@ 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.writeBitmapLookupTable::
-	When true, Git will include a "lookup table" section in the
-	bitmap index (if one is written). This table is used to defer
-	loading individual bitmaps as late as possible. This can be
-	beneficial in repositories that have relatively large bitmap
-	indexes. Defaults to false.
-
 pack.writeReverseIndex::
 	When true, git will write a corresponding .rev file (see:
-	linkgit:gitformat-pack[5])
+	link:../technical/pack-format.html[Documentation/technical/pack-format.txt])
 	for each new packfile that it writes in all places except for
 	linkgit:git-fast-import[1] and in the bulk checkin mechanism.
 	Defaults to false.

Documentation/config/protocol.txt

@@ -58,6 +58,6 @@ protocol.version::
 * `1` - the original wire protocol with the addition of a version string
   in the initial response from the server.
 
-* `2` - Wire protocol version 2, see linkgit:gitprotocol-v2[5].
+* `2` - link:technical/protocol-v2.html[wire protocol version 2].
 
 --

Documentation/config/push.txt

@@ -1,14 +1,3 @@
-push.autoSetupRemote::
-	If set to "true" assume `--set-upstream` on default push when no
-	upstream tracking exists for the current branch; this option
-	takes effect with push.default options 'simple', 'upstream',
-	and 'current'. It is useful if by default you want new branches
-	to be pushed to the default remote (like the behavior of
-	'push.default=current') and you also want the upstream tracking
-	to be set. Workflows most likely to benefit from this option are
-	'simple' central workflows where all branches are expected to
-	have the same name on the remote.
-
 push.default::
 	Defines the action `git push` should take if no refspec is
 	given (whether from the command-line, config, or elsewhere).
@@ -110,8 +99,18 @@ This will result in only b (a and c are cleared).
 ----
 
 push.recurseSubmodules::
-	May be "check", "on-demand", "only", or "no", with the same behavior
-	as that of "push --recurse-submodules".
+	Make sure all submodule commits used by the revisions to be pushed
+	are available on a remote-tracking branch. If the value is 'check'
+	then Git will verify that all submodule commits that changed in the
+	revisions to be pushed are available on at least one remote of the
+	submodule. If any commits are missing, the push will be aborted and
+	exit with non-zero status. If the value is 'on-demand' then all
+	submodules that changed in the revisions to be pushed will be
+	pushed. If on-demand was not able to push all necessary revisions
+	it will also be aborted and exit with non-zero status. If the value
+	is 'no' then default behavior of ignoring submodules when pushing
+	is retained. You may override this configuration at time of push by
+	specifying '--recurse-submodules=check|on-demand|no'.
 	If not set, 'no' is used by default, unless 'submodule.recurse' is
 	set (in which case a 'true' value means 'on-demand').
 
@@ -127,8 +126,3 @@ push.negotiate::
 	server attempt to find commits in common. If "false", Git will
 	rely solely on the server's ref advertisement to find commits
 	in common.
-
-push.useBitmaps::
-	If set to "false", disable use of bitmaps for "git push" even if
-	`pack.useBitmaps` is "true", without preventing other git operations
-	from using bitmaps. Default is true.

Documentation/config/rebase.txt

@@ -21,9 +21,6 @@ rebase.autoStash::
 	`--autostash` options of linkgit:git-rebase[1].
 	Defaults to false.
 
-rebase.updateRefs::
-	If set to true enable `--update-refs` option by default.
-
 rebase.missingCommitsCheck::
 	If set to "warn", git rebase -i will print a warning if some
 	commits are removed (e.g. a line was deleted), however the

Documentation/config/repack.txt

@@ -30,12 +30,3 @@ repack.updateServerInfo::
 	If set to false, linkgit:git-repack[1] will not run
 	linkgit:git-update-server-info[1]. Defaults to true. Can be overridden
 	when true by the `-n` option of linkgit:git-repack[1].
-
-repack.cruftWindow::
-repack.cruftWindowMemory::
-repack.cruftDepth::
-repack.cruftThreads::
-	Parameters used by linkgit:git-pack-objects[1] when generating
-	a cruft pack and the respective parameters are not given over
-	the command line. See similarly named `pack.*` configuration
-	variables for defaults and meaning.

Documentation/config/revert.txt

@@ -1,3 +0,0 @@
-revert.reference::
-	Setting this variable to true makes `git revert` behave
-	as if the `--reference` option is given.

Documentation/config/safe.txt

@@ -1,22 +1,3 @@
-safe.bareRepository::
-	Specifies which bare repositories Git will work with. The currently
-	supported values are:
-+
-* `all`: Git works with all bare repositories. This is the default.
-* `explicit`: Git only works with bare repositories specified via
-  the top-level `--git-dir` command-line option, or the `GIT_DIR`
-  environment variable (see linkgit:git[1]).
-+
-If you do not use bare repositories in your workflow, then it may be
-beneficial to set `safe.bareRepository` to `explicit` in your global
-config. This will protect you from attacks that involve cloning a
-repository that contains a bare repository and running a Git command
-within that directory.
-+
-This config setting is only respected in protected configuration (see
-<<SCOPES>>). This prevents the untrusted repository from tampering with
-this value.
-
 safe.directory::
 	These config entries specify Git-tracked directories that are
 	considered safe even if they are owned by someone other than the
@@ -31,9 +12,9 @@ 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 in protected configuration (see
-<<SCOPES>>). This prevents the untrusted repository from tampering with this
-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

Documentation/config/sendemail.txt

@@ -18,49 +18,17 @@ sendemail.<identity>.*::
 	identity is selected, through either the command-line or
 	`sendemail.identity`.
 
-sendemail.multiEdit::
-	If true (default), a single editor instance will be spawned to edit
-	files you have to edit (patches when `--annotate` is used, and the
-	summary when `--compose` is used). If false, files will be edited one
-	after the other, spawning a new editor each time.
-
-sendemail.confirm::
-	Sets the default for whether to confirm before sending. Must be
-	one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm`
-	in the linkgit:git-send-email[1] documentation for the meaning of these
-	values.
-
 sendemail.aliasesFile::
-	To avoid typing long email addresses, point this to one or more
-	email aliases files.  You must also supply `sendemail.aliasFileType`.
-
 sendemail.aliasFileType::
-	Format of the file(s) specified in sendemail.aliasesFile. Must be
-	one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'.
-+
-What an alias file in each format looks like can be found in
-the documentation of the email program of the same name. The
-differences and limitations from the standard formats are
-described below:
-+
---
-sendmail;;
-*	Quoted aliases and quoted addresses are not supported: lines that
-	contain a `"` symbol are ignored.
-*	Redirection to a file (`/path/name`) or pipe (`|command`) is not
-	supported.
-*	File inclusion (`:include: /path/name`) is not supported.
-*	Warnings are printed on the standard error output for any
-	explicitly unsupported constructs, and any other lines that are not
-	recognized by the parser.
---
 sendemail.annotate::
 sendemail.bcc::
 sendemail.cc::
 sendemail.ccCmd::
 sendemail.chainReplyTo::
+sendemail.confirm::
 sendemail.envelopeSender::
 sendemail.from::
+sendemail.multiEdit::
 sendemail.signedoffbycc::
 sendemail.smtpPass::
 sendemail.suppresscc::
@@ -76,9 +44,7 @@ sendemail.thread::
 sendemail.transferEncoding::
 sendemail.validate::
 sendemail.xmailer::
-	These configuration variables all provide a default for
-	linkgit:git-send-email[1] command-line options. See its
-	documentation for details.
+	See linkgit:git-send-email[1] for description.
 
 sendemail.signedoffcc (deprecated)::
 	Deprecated alias for `sendemail.signedoffbycc`.

Documentation/config/transfer.txt

@@ -1,41 +1,3 @@
-transfer.credentialsInUrl::
-	A configured URL can contain plaintext credentials in the form
-	`<protocol>://<user>:<password>@<domain>/<path>`. You may want
-	to warn or forbid the use of such configuration (in favor of
-	using linkgit:git-credential[1]). This will be used on
-	linkgit:git-clone[1], linkgit:git-fetch[1], linkgit:git-push[1],
-	and any other direct use of the configured URL.
-+
-Note that this is currently limited to detecting credentials in
-`remote.<name>.url` configuration, it won't detect credentials in
-`remote.<name>.pushurl` configuration.
-+
-You might want to enable this to prevent inadvertent credentials
-exposure, e.g. because:
-+
-* The OS or system where you're running git may not provide a way or
-  otherwise allow you to configure the permissions of the
-  configuration file where the username and/or password are stored.
-* Even if it does, having such data stored "at rest" might expose you
-  in other ways, e.g. a backup process might copy the data to another
-  system.
-* The git programs will pass the full URL to one another as arguments
-  on the command-line, meaning the credentials will be exposed to other
-  users on OS's or systems that allow other users to see the full
-  process list of other users. On linux the "hidepid" setting
-  documented in procfs(5) allows for configuring this behavior.
-+
-If such concerns don't apply to you then you probably don't need to be
-concerned about credentials exposure due to storing that sensitive
-data in git's configuration files. If you do want to use this, set
-`transfer.credentialsInUrl` to one of these values:
-+
-* `allow` (default): Git will proceed with its activity without warning.
-* `warn`: Git will write a warning message to `stderr` when parsing a URL
-  with a plaintext credential.
-* `die`: Git will write a failure message to `stderr` when parsing a URL
-  with a plaintext credential.
-
 transfer.fsckObjects::
 	When `fetch.fsckObjects` or `receive.fsckObjects` are
 	not set, the value of this variable is used instead.

Documentation/config/uploadpack.txt

@@ -49,9 +49,9 @@ uploadpack.packObjectsHook::
 	`pack-objects` to the hook, and expects a completed packfile on
 	stdout.
 +
-Note that this configuration variable is only respected when it is specified
-in protected configuration (see <<SCOPES>>). This is a safety measure
-against fetching from untrusted repositories.
+Note that this configuration variable is ignored if it is seen in the
+repository-level config (this is a safety measure against fetching from
+untrusted repositories).
 
 uploadpack.allowFilter::
 	If this option is set, `upload-pack` will support partial

Documentation/diff-format.txt

@@ -43,7 +43,7 @@ That is, from the left to the right:
 . a space.
 . sha1 for "src"; 0\{40\} if creation or unmerged.
 . a space.
-. sha1 for "dst"; 0\{40\} if deletion, unmerged or "work tree out of sync with the index".
+. sha1 for "dst"; 0\{40\} if creation, unmerged or "look at work tree".
 . a space.
 . status, followed by optional "score" number.
 . a tab or a NUL when `-z` option is used.
@@ -69,8 +69,8 @@ percentage of similarity between the source and target of the move or
 copy).  Status letter M may be followed by a score (denoting the
 percentage of dissimilarity) for file rewrites.
 
-The sha1 for "dst" is shown as all 0's if a file on the filesystem
-is out of sync with the index.
+<sha1> is shown as all 0's if a file is new on the filesystem
+and it is out of sync with the index.
 
 Example:
 

Documentation/fsck-msgids.txt

@@ -1,161 +0,0 @@
-`badDate`::
-	(ERROR) Invalid date format in an author/committer line.
-
-`badDateOverflow`::
-	(ERROR) Invalid date value in an author/committer line.
-
-`badEmail`::
-	(ERROR) Invalid email format in an author/committer line.
-
-`badFilemode`::
-	(INFO) A tree contains a bad filemode entry.
-
-`badName`::
-	(ERROR) An author/committer name is empty.
-
-`badObjectSha1`::
-	(ERROR) An object has a bad sha1.
-
-`badParentSha1`::
-	(ERROR) A commit object has a bad parent sha1.
-
-`badTagName`::
-	(INFO) A tag has an invalid format.
-
-`badTimezone`::
-	(ERROR) Found an invalid time zone in an author/committer line.
-
-`badTree`::
-	(ERROR) A tree cannot be parsed.
-
-`badTreeSha1`::
-	(ERROR) A tree has an invalid format.
-
-`badType`::
-	(ERROR) Found an invalid object type.
-
-`duplicateEntries`::
-	(ERROR) A tree contains duplicate file entries.
-
-`emptyName`::
-	(WARN) A path contains an empty name.
-
-`extraHeaderEntry`::
-	(IGNORE) Extra headers found after `tagger`.
-
-`fullPathname`::
-	(WARN) A path contains the full path starting with "/".
-
-`gitattributesSymlink`::
-	(INFO) `.gitattributes` is a symlink.
-
-`gitignoreSymlink`::
-	(INFO) `.gitignore` is a symlink.
-
-`gitmodulesBlob`::
-	(ERROR) A non-blob found at `.gitmodules`.
-
-`gitmodulesLarge`::
-	(ERROR) The `.gitmodules` file is too large to parse.
-
-`gitmodulesMissing`::
-	(ERROR) Unable to read `.gitmodules` blob.
-
-`gitmodulesName`::
-	(ERROR) A submodule name is invalid.
-
-`gitmodulesParse`::
-	(INFO) Could not parse `.gitmodules` blob.
-
-`gitmodulesLarge`;
-	(ERROR) `.gitmodules` blob is too large to parse.
-
-`gitmodulesPath`::
-	(ERROR) `.gitmodules` path is invalid.
-
-`gitmodulesSymlink`::
-	(ERROR) `.gitmodules` is a symlink.
-
-`gitmodulesUpdate`::
-	(ERROR) Found an invalid submodule update setting.
-
-`gitmodulesUrl`::
-	(ERROR) Found an invalid submodule url.
-
-`hasDot`::
-	(WARN) A tree contains an entry named `.`.
-
-`hasDotdot`::
-	(WARN) A tree contains an entry named `..`.
-
-`hasDotgit`::
-	(WARN) A tree contains an entry named `.git`.
-
-`mailmapSymlink`::
-	(INFO) `.mailmap` is a symlink.
-
-`missingAuthor`::
-	(ERROR) Author is missing.
-
-`missingCommitter`::
-	(ERROR) Committer is missing.
-
-`missingEmail`::
-	(ERROR) Email is missing in an author/committer line.
-
-`missingNameBeforeEmail`::
-	(ERROR) Missing name before an email in an author/committer line.
-
-`missingObject`::
-	(ERROR) Missing `object` line in tag object.
-
-`missingSpaceBeforeDate`::
-	(ERROR) Missing space before date in an author/committer line.
-
-`missingSpaceBeforeEmail`::
-	(ERROR) Missing space before the email in author/committer line.
-
-`missingTag`::
-	(ERROR) Unexpected end after `type` line in a tag object.
-
-`missingTagEntry`::
-	(ERROR) Missing `tag` line in a tag object.
-
-`missingTaggerEntry`::
-	(INFO) Missing `tagger` line in a tag object.
-
-`missingTree`::
-	(ERROR) Missing `tree` line in a commit object.
-
-`missingType`::
-	(ERROR) Invalid type value on the `type` line in a tag object.
-
-`missingTypeEntry`::
-	(ERROR) Missing `type` line in a tag object.
-
-`multipleAuthors`::
-	(ERROR) Multiple author lines found in a commit.
-
-`nulInCommit`::
-	(WARN) Found a NUL byte in the commit object body.
-
-`nulInHeader`::
-	(FATAL) NUL byte exists in the object header.
-
-`nullSha1`::
-	(WARN) Tree contains entries pointing to a null sha1.
-
-`treeNotSorted`::
-	(ERROR) A tree is not properly sorted.
-
-`unknownType`::
-	(ERROR) Found an unknown object type.
-
-`unterminatedHeader`::
-	(FATAL) Missing end-of-line in the object header.
-
-`zeroPaddedDate`::
-	(ERROR) Found a zero padded date in an author/commiter line.
-
-`zeroPaddedFilemode`::
-	(WARN) Found a zero padded filemode in a tree.

Documentation/git-add.txt

@@ -188,9 +188,7 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
 	forcibly add them again to the index.  This is useful after
 	changing `core.autocrlf` configuration or the `text` attribute
 	in order to correct files added with wrong CRLF/LF line endings.
-	This option implies `-u`. Lone CR characters are untouched, thus
-	while a CRLF cleans to LF, a CRCRLF sequence is only partially
-	cleaned to CRLF.
+	This option implies `-u`.
 
 --chmod=(+|-)x::
 	Override the executable bit of the added files.  The executable
@@ -433,13 +431,6 @@ they will make the patch impossible to apply:
 * deleting context or removal lines
 * modifying the contents of context or removal lines
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/add.txt[]
-
 SEE ALSO
 --------
 linkgit:git-status[1]

Documentation/git-am.txt

@@ -112,7 +112,10 @@ default.   You can use `--no-utf8` to override this.
 	am.threeWay configuration variable. For more information,
 	see am.threeWay in linkgit:git-config[1].
 
-include::rerere-options.txt[]
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
 
 --ignore-space-change::
 --ignore-whitespace::
@@ -258,13 +261,6 @@ This command can run `applypatch-msg`, `pre-applypatch`,
 and `post-applypatch` hooks.  See linkgit:githooks[5] for more
 information.
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/am.txt[]
-
 SEE ALSO
 --------
 linkgit:git-apply[1].

Documentation/git-annotate.txt

@@ -8,7 +8,7 @@ git-annotate - Annotate file lines with commit information
 SYNOPSIS
 --------
 [verse]
-'git annotate' [<options>] [<rev-opts>] [<rev>] [--] <file>
+'git annotate' [<options>] <file> [<revision>]
 
 DESCRIPTION
 -----------

Documentation/git-apply.txt

@@ -263,9 +263,13 @@ has no effect when `--index` or `--cached` is in use.
 CONFIGURATION
 -------------
 
-include::includes/cmd-config-section-all.txt[]
-
-include::config/apply.txt[]
+apply.ignoreWhitespace::
+	Set to 'change' if you want changes in whitespace to be ignored by default.
+	Set to one of: no, none, never, false if you want changes in
+	whitespace to be significant.
+apply.whitespace::
+	When no `--whitespace` flag is given from the command
+	line, this configuration item is used as the default.
 
 SUBMODULES
 ----------

Documentation/git-archive.txt

@@ -34,12 +34,10 @@ OPTIONS
 -------
 
 --format=<fmt>::
-	Format of the resulting archive. Possible values are `tar`,
-	`zip`, `tar.gz`, `tgz`, and any format defined using the
-	configuration option `tar.<format>.command`. If `--format`
+	Format of the resulting archive: 'tar' or 'zip'. If this option
 	is not given, and the output file is specified, the format is
-	inferred from the filename if possible (e.g. writing to `foo.zip`
-	makes the output to be in the `zip` format). Otherwise the output
+	inferred from the filename if possible (e.g. writing to "foo.zip"
+	makes the output to be in the zip format). Otherwise the output
 	format is `tar`.
 
 -l::
@@ -51,9 +49,7 @@ OPTIONS
 	Report progress to stderr.
 
 --prefix=<prefix>/::
-	Prepend <prefix>/ to paths in the archive.  Can be repeated; its
-	rightmost value is used for all tracked files.  See below which
-	value gets used by `--add-file` and `--add-virtual-file`.
+	Prepend <prefix>/ to each filename in the archive.
 
 -o <file>::
 --output=<file>::
@@ -61,26 +57,9 @@ OPTIONS
 
 --add-file=<file>::
 	Add a non-tracked file to the archive.  Can be repeated to add
-	multiple files.  The path of the file in the archive is built by
-	concatenating the value of the last `--prefix` option (if any)
-	before this `--add-file` and the basename of <file>.
-
---add-virtual-file=<path>:<content>::
-	Add the specified contents to the archive.  Can be repeated to add
 	multiple files.  The path of the file in the archive is built
-	by concatenating the value of the last `--prefix` option (if any)
-	before this `--add-virtual-file` and `<path>`.
-+
-The `<path>` argument can start and end with a literal double-quote
-character; the contained file name is interpreted as a C-style string,
-i.e. the backslash is interpreted as escape character. The path must
-be quoted if it contains a colon, to avoid the colon from being
-misinterpreted as the separator between the path and the contents, or
-if the path begins or ends with a double-quote character.
-+
-The file mode is limited to a regular file, and the option may be
-subject to platform-dependent command-line limits. For non-trivial
-cases, write an untracked file and use `--add-file` instead.
+	by concatenating the value for `--prefix` (if any) and the
+	basename of <file>.
 
 --worktree-attributes::
 	Look for attributes in .gitattributes files in the working tree
@@ -145,16 +124,17 @@ tar.<format>.command::
 	is executed using the shell with the generated tar file on its
 	standard input, and should produce the final output on its
 	standard output. Any compression-level options will be passed
-	to the command (e.g., `-9`).
+	to the command (e.g., "-9"). An output file with the same
+	extension as `<format>` will be use this format if no other
+	format is given.
 +
-The `tar.gz` and `tgz` formats are defined automatically and use the
-magic command `git archive gzip` by default, which invokes an internal
-implementation of gzip.
+The "tar.gz" and "tgz" formats are defined automatically and default to
+`gzip -cn`. You may override them with custom commands.
 
 tar.<format>.remote::
-	If true, enable the format for use by remote clients via
+	If true, enable `<format>` for use by remote clients via
 	linkgit:git-upload-archive[1]. Defaults to false for
-	user-defined formats, but true for the `tar.gz` and `tgz`
+	user-defined formats, but true for the "tar.gz" and "tgz"
 	formats.
 
 [[ATTRIBUTES]]
@@ -214,12 +194,6 @@ EXAMPLES
 	commit on the current branch. Note that the output format is
 	inferred by the extension of the output file.
 
-`git archive -o latest.tar --prefix=build/ --add-file=configure --prefix= HEAD`::
-
-	Creates a tar archive that contains the contents of the latest
-	commit on the current branch with no prefix and the untracked
-	file 'configure' with the prefix 'build/'.
-
 `git config tar.tar.xz.command "xz -c"`::
 
 	Configure a "tar.xz" format for making LZMA-compressed tarfiles.

Documentation/git-blame.txt

@@ -241,12 +241,6 @@ MAPPING AUTHORS
 
 See linkgit:gitmailmap[5].
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/blame.txt[]
 
 SEE ALSO
 --------

Documentation/git-branch.txt

@@ -221,17 +221,13 @@ The exact upstream branch is chosen depending on the optional argument:
 itself as the upstream; `--track=inherit` means to copy the upstream
 configuration of the start-point branch.
 +
-The branch.autoSetupMerge configuration variable specifies how `git switch`,
-`git checkout` and `git branch` should behave when neither `--track` nor
-`--no-track` are specified:
-+
-The default option, `true`, behaves as though `--track=direct`
-were given whenever the start-point is a remote-tracking branch.
-`false` behaves as if `--no-track` were given. `always` behaves as though
-`--track=direct` were given. `inherit` behaves as though `--track=inherit`
-were given. `simple` behaves as though `--track=direct` were given only when
-the start-point is a remote-tracking branch and the new branch has the same
-name as the remote branch.
+`--track=direct` is the default when the start point is a remote-tracking branch.
+Set the branch.autoSetupMerge configuration variable to `false` if you
+want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
+were given. Set it to `always` if you want this behavior when the
+start-point is either a local or remote-tracking branch. 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.
@@ -336,10 +332,6 @@ CONFIGURATION
 `--list` is used or implied. The default is to use a pager.
 See linkgit:git-config[1].
 
-include::includes/cmd-config-section-rest.txt[]
-
-include::config/branch.txt[]
-
 EXAMPLES
 --------
 

Documentation/git-bugreport.txt

@@ -9,7 +9,6 @@ SYNOPSIS
 --------
 [verse]
 'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <format>]
-		[--diagnose[=<mode>]]
 
 DESCRIPTION
 -----------
@@ -32,10 +31,6 @@ The following information is captured automatically:
  - A list of enabled hooks
  - $SHELL
 
-Additional information may be gathered into a separate zip archive using the
-`--diagnose` option, and can be attached alongside the bugreport document to
-provide additional context to readers.
-
 This tool is invoked via the typical Git setup process, which means that in some
 cases, it might not be able to launch - for example, if a relevant config file
 is unreadable. In this kind of scenario, it may be helpful to manually gather
@@ -54,19 +49,6 @@ OPTIONS
 	named 'git-bugreport-<formatted suffix>'. This should take the form of a
 	strftime(3) format string; the current local time will be used.
 
---no-diagnose::
---diagnose[=<mode>]::
-	Create a zip archive of supplemental information about the user's
-	machine, Git client, and repository state. The archive is written to the
-	same output directory as the bug report and is named
-	'git-diagnostics-<formatted suffix>'.
-+
-Without `mode` specified, the diagnostic archive will contain the default set of
-statistics reported by `git diagnose`. An optional `mode` value may be specified
-to change which information is included in the archive. See
-linkgit:git-diagnose[1] for the list of valid values for `mode` and details
-about their usage.
-
 GIT
 ---
 Part of the linkgit:git[1] suite

Documentation/git-bundle.txt

@@ -42,7 +42,7 @@ 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 packed archive format itself bundles can either be
+Like the the packed archive format itself bundles can either be
 self-contained, or be created using exclusions.
 See the "OBJECT PREREQUISITES" section below.
 
@@ -56,8 +56,10 @@ 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 linkgit:gitformat-bundle[5] for more details and the discussion of
-"thin pack" in linkgit:gitformat-pack[5] for further details.
+See link:technical/bundle-format.html[the `bundle-format`
+documentation] for more details and the discussion of "thin pack" in
+link:technical/pack-format.html[the pack format documentation] for
+further details.
 
 OPTIONS
 -------
@@ -75,7 +77,7 @@ verify <file>::
 	commits exist and are fully linked in the current repository.
 	Then, 'git bundle' prints a list of missing commits, if any.
 	Finally, information about additional capabilities, such as "object
-	filter", is printed. See "Capabilities" in linkgit:gitformat-bundle[5]
+	filter", is printed. See "Capabilities" in link:technical/bundle-format.html
 	for more information. The exit code is zero for success, but will
 	be nonzero if the bundle file is invalid.
 
@@ -335,11 +337,6 @@ You can also see what references it offers:
 $ git ls-remote mybundle
 ----------------
 
-FILE FORMAT
------------
-
-See linkgit:gitformat-bundle[5].
-
 GIT
 ---
 Part of the linkgit:git[1] suite

Documentation/git-cat-file.txt

@@ -14,7 +14,7 @@ SYNOPSIS
 'git cat-file' (-t | -s) [--allow-unknown-type] <object>
 'git cat-file' (--batch | --batch-check | --batch-command) [--batch-all-objects]
 	     [--buffer] [--follow-symlinks] [--unordered]
-	     [--textconv | --filters] [-z]
+	     [--textconv | --filters]
 'git cat-file' (--textconv | --filters)
 	     [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
 
@@ -63,12 +63,6 @@ OPTIONS
 	or to ask for a "blob" with `<object>` being a tag object that
 	points at it.
 
---[no-]mailmap::
---[no-]use-mailmap::
-       Use mailmap file to map author, committer and tagger names
-       and email addresses to canonical real names and email addresses.
-       See linkgit:git-shortlog[1].
-
 --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
@@ -213,11 +207,6 @@ respectively print:
 	/etc/passwd
 --
 
--z::
-	Only meaningful with `--batch`, `--batch-check`, or
-	`--batch-command`; input is NUL-delimited instead of
-	newline-delimited.
-
 
 OUTPUT
 ------

Documentation/git-checkout.txt

@@ -600,13 +600,6 @@ $ edit frotz
 $ git add frotz
 ------------
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/checkout.txt[]
-
 SEE ALSO
 --------
 linkgit:git-switch[1],

Documentation/git-cherry-pick.txt

@@ -156,7 +156,10 @@ effect to your index in a row.
 	Pass the merge strategy-specific option through to the
 	merge strategy.  See linkgit:git-merge[1] for details.
 
-include::rerere-options.txt[]
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
 
 SEQUENCER SUBCOMMANDS
 ---------------------

Documentation/git-clean.txt

@@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree
 SYNOPSIS
 --------
 [verse]
-'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] [<pathspec>...]
+'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...
 
 DESCRIPTION
 -----------
@@ -20,16 +20,16 @@ Normally, only files unknown to Git are removed, but if the `-x`
 option is specified, ignored files are also removed. This can, for
 example, be useful to remove all build products.
 
-If any optional `<pathspec>...` arguments are given, only those paths
-that match the pathspec are affected.
+If any optional `<path>...` arguments are given, only those paths
+are affected.
 
 OPTIONS
 -------
 -d::
-	Normally, when no <pathspec> is specified, git clean will not
+	Normally, when no <path> is specified, git clean will not
 	recurse into untracked directories to avoid removing too much.
 	Specify -d to have it recurse into such directories as well.
-	If a <pathspec> is specified, -d is irrelevant; all untracked
+	If any paths are specified, -d is irrelevant; all untracked
 	files matching the specified paths (with exceptions for nested
 	git directories mentioned under `--force`) will be removed.
 
@@ -133,13 +133,6 @@ help::
 
   Show brief usage of interactive git-clean.
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/clean.txt[]
-
 SEE ALSO
 --------
 linkgit:gitignore[5]

Documentation/git-clone.txt

@@ -323,13 +323,6 @@ or `--mirror` is given)
 	for `host.xz:foo/.git`).  Cloning into an existing directory
 	is only allowed if the directory is empty.
 
---bundle-uri=<uri>::
-	Before fetching from the remote, fetch a bundle from the given
-	`<uri>` and unbundle the data into the local repository. The refs
-	in the bundle will be stored under the hidden `refs/bundle/*`
-	namespace. This option is incompatible with `--depth`,
-	`--shallow-since`, and `--shallow-exclude`.
-
 :git-clone: 1
 include::urls.txt[]
 
@@ -370,15 +363,6 @@ $ cd my-linux
 $ git clone --bare -l /home/proj/.git /pub/scm/proj.git
 ------------
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/init.txt[]
-
-include::config/clone.txt[]
-
 
 GIT
 ---

Documentation/git-column.txt

@@ -74,13 +74,6 @@ v2.4.3  v2.4.4      v2.4.5      v2.4.6      v2.4.7
 v2.4.8  v2.4.9
 ------------
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/column.txt[]
-
 GIT
 ---
 Part of the linkgit:git[1] suite

Documentation/git-commit-graph.txt

@@ -10,10 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git commit-graph verify' [--object-dir <dir>] [--shallow] [--[no-]progress]
-'git commit-graph write' [--object-dir <dir>] [--append]
-			[--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits]
-			[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress]
-			<split options>
+'git commit-graph write' <options> [--object-dir <dir>] [--[no-]progress]
 
 
 DESCRIPTION
@@ -145,18 +142,6 @@ $ git show-ref -s | git commit-graph write --stdin-commits
 $ git rev-parse HEAD | git commit-graph write --stdin-commits --append
 ------------------------------------------------
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/commitgraph.txt[]
-
-
-FILE FORMAT
------------
-
-see linkgit:gitformat-commit-graph[5].
 
 GIT
 ---

Documentation/git-commit.txt

@@ -557,10 +557,6 @@ The editor used to edit the commit log message will be chosen from the
 `VISUAL` environment variable, or the `EDITOR` environment variable (in that
 order).  See linkgit:git-var[1] for details.
 
-include::includes/cmd-config-section-rest.txt[]
-
-include::config/commit.txt[]
-
 HOOKS
 -----
 This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`,

Documentation/git-config.txt

@@ -248,7 +248,7 @@ Valid `<type>`'s include:
 --show-scope::
 	Similar to `--show-origin` in that it augments the output of
 	all queried config options with the scope of that value
-	(worktree, local, global, system, command).
+	(local, global, system, command).
 
 --get-colorbool <name> [<stdout-is-tty>]::
 
@@ -297,20 +297,23 @@ The default is to use a pager.
 FILES
 -----
 
-By default, 'git config' will read configuration options from multiple
-files:
+If not set explicitly with `--file`, there are four files where
+'git config' will search for configuration options:
 
 $(prefix)/etc/gitconfig::
 	System-wide configuration file.
 
 $XDG_CONFIG_HOME/git/config::
+	Second user-specific configuration file. If $XDG_CONFIG_HOME is not set
+	or empty, `$HOME/.config/git/config` will be used. Any single-valued
+	variable set in this file will be overwritten by whatever is in
+	`~/.gitconfig`.  It is a good idea not to create this file if
+	you sometimes use older versions of Git, as support for this
+	file was added fairly recently.
+
 ~/.gitconfig::
-	User-specific configuration files. When the XDG_CONFIG_HOME environment
-	variable is not set or empty, $HOME/.config/ is used as
-	$XDG_CONFIG_HOME.
-+
-These are also called "global" configuration files. If both files exist, both
-files are read in the order given above.
+	User-specific configuration file. Also called "global"
+	configuration file.
 
 $GIT_DIR/config::
 	Repository specific configuration file.
@@ -319,80 +322,28 @@ $GIT_DIR/config.worktree::
 	This is optional and is only searched when
 	`extensions.worktreeConfig` is present in $GIT_DIR/config.
 
-You may also provide additional configuration parameters when running any
-git command by using the `-c` option. See linkgit:git[1] for details.
-
-Options will be read from all of these files that are available. If the
-global or the system-wide configuration files are missing or unreadable they
-will be ignored. If the repository configuration file is missing or unreadable,
-'git config' will exit with a non-zero error code. An error message is produced
-if the file is unreadable, but not if it is missing.
+If no further options are given, all reading options will read all of these
+files that are available. If the global or the system-wide configuration
+file are not available they will be ignored. If the repository configuration
+file is not available or readable, 'git config' will exit with a non-zero
+error code. However, in neither case will an error message be issued.
 
 The files are read in the order given above, with last value found taking
 precedence over values read earlier.  When multiple values are taken then all
 values of a key from all files will be used.
 
-By default, options are only written to the repository specific
+You may override individual configuration parameters when running any git
+command by using the `-c` option. See linkgit:git[1] for details.
+
+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 limit which configuration sources are read from or written to by
-specifying the path of a file with the `--file` option, or by specifying a
-configuration scope with `--system`, `--global`, `--local`, or `--worktree`.
-For more, see <<OPTIONS>> above.
+You can override these rules using the `--global`, `--system`,
+`--local`, `--worktree`, and `--file` command-line options; see
+<<OPTIONS>> above.
 
-[[SCOPES]]
-SCOPES
-------
 
-Each configuration source falls within a configuration scope. The scopes
-are:
-
-system::
-	$(prefix)/etc/gitconfig
-
-global::
-	$XDG_CONFIG_HOME/git/config
-+
-~/.gitconfig
-
-local::
-	$GIT_DIR/config
-
-worktree::
-	$GIT_DIR/config.worktree
-
-command::
-	GIT_CONFIG_{COUNT,KEY,VALUE} environment variables (see <<ENVIRONMENT>>
-	below)
-+
-the `-c` option
-
-With the exception of 'command', each scope corresponds to a command line
-option: `--system`, `--global`, `--local`, `--worktree`.
-
-When reading options, specifying a scope will only read options from the
-files within that scope. When writing options, specifying a scope will write
-to the files within that scope (instead of the repository specific
-configuration file). See <<OPTIONS>> above for a complete description.
-
-Most configuration options are respected regardless of the scope it is
-defined in, but some options are only respected in certain scopes. See the
-respective option's documentation for the full details.
-
-Protected configuration
-~~~~~~~~~~~~~~~~~~~~~~~
-
-Protected configuration refers to the 'system', 'global', and 'command' scopes.
-For security reasons, certain options are only respected when they are
-specified in protected configuration, and ignored otherwise.
-
-Git treats these scopes as if they are controlled by the user or a trusted
-administrator. This is because an attacker who controls these scopes can do
-substantial harm without using Git, so it is assumed that the user's environment
-protects these scopes against attackers.
-
-[[ENVIRONMENT]]
 ENVIRONMENT
 -----------
 

Documentation/git-credential-cache--daemon.txt

@@ -8,7 +8,7 @@ git-credential-cache--daemon - Temporarily store user credentials in memory
 SYNOPSIS
 --------
 [verse]
-'git credential-cache{litdd}daemon' [--debug] <socket-path>
+'git credential-cache{litdd}daemon' [--debug] <socket>
 
 DESCRIPTION
 -----------
@@ -16,7 +16,7 @@ DESCRIPTION
 NOTE: You probably don't want to invoke this command yourself; it is
 started automatically when you use linkgit:git-credential-cache[1].
 
-This command listens on the Unix domain socket specified by `<socket-path>`
+This command listens on the Unix domain socket specified by `<socket>`
 for `git-credential-cache` clients. Clients may store and retrieve
 credentials. Each credential is held for a timeout specified by the
 client; once no credentials are held, the daemon exits.

Documentation/git-credential-cache.txt

@@ -69,10 +69,10 @@ $ git push http://example.com/repo.git
 ------------------------------------
 
 You can provide options via the credential.helper configuration
-variable (this example increases the cache time to 1 hour):
+variable (this example drops the cache time to 5 minutes):
 
 -------------------------------------------------------
-$ git config credential.helper 'cache --timeout=3600'
+$ git config credential.helper 'cache --timeout=300'
 -------------------------------------------------------
 
 GIT

Documentation/git-credential.txt

@@ -160,8 +160,6 @@ empty string.
 Components which are missing from the URL (e.g., there is no
 username in the example above) will be left unset.
 
-Unrecognised attributes are silently discarded.
-
 GIT
 ---
 Part of the linkgit:git[1] suite

Documentation/git-cvsserver.txt

@@ -63,10 +63,11 @@ Print version information and exit
 Print usage information and exit
 
 <directory>::
-The remaining arguments provide a list of directories. If no directories
-are given, then all are allowed. Repositories within these directories
-still require the `gitcvs.enabled` config option, unless `--export-all`
-is specified.
+You can specify a list of allowed directories. If no directories
+are given, all are allowed. This is an additional restriction, gitcvs
+access still needs to be enabled by the `gitcvs.enabled` config option
+unless `--export-all` was given, too.
+
 
 LIMITATIONS
 -----------
@@ -310,13 +311,11 @@ ENVIRONMENT
 These variables obviate the need for command-line options in some
 circumstances, allowing easier restricted usage through git-shell.
 
-GIT_CVSSERVER_BASE_PATH::
-	This variable replaces the argument to --base-path.
+GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path.
 
-GIT_CVSSERVER_ROOT::
-	This variable specifies a single directory, replacing the
-	`<directory>...` argument list. The repository still requires the
-	`gitcvs.enabled` config option, unless `--export-all` is specified.
+GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The
+repository must still be configured to allow access through
+git-cvsserver, as described above.
 
 When these environment variables are set, the corresponding
 command-line arguments may not be used.

Documentation/git-daemon.txt

@@ -32,8 +32,8 @@ that service if it is enabled.
 It verifies that the directory has the magic file "git-daemon-export-ok", and
 it will refuse to export any Git directory that hasn't explicitly been marked
 for export this way (unless the `--export-all` parameter is specified). If you
-pass some directory paths as 'git daemon' arguments, the offers are limited to
-repositories within those directories.
+pass some directory paths as 'git daemon' arguments, you can further restrict
+the offers to a whitelist comprising of those.
 
 By default, only `upload-pack` service is enabled, which serves
 'git fetch-pack' and 'git ls-remote' clients, which are invoked
@@ -50,7 +50,7 @@ OPTIONS
 	Match paths exactly (i.e. don't allow "/foo/repo" when the real path is
 	"/foo/repo.git" or "/foo/repo/.git") and don't do user-relative paths.
 	'git daemon' will refuse to start when this option is enabled and no
-	directory arguments are provided.
+	whitelist is specified.
 
 --base-path=<path>::
 	Remap all the path requests as relative to the given path.
@@ -73,7 +73,7 @@ OPTIONS
 	%IP for the server's IP address, %P for the port number,
 	and %D for the absolute path of the named repository.
 	After interpolation, the path is validated against the directory
-	list.
+	whitelist.
 
 --export-all::
 	Allow pulling from all directories that look like Git repositories
@@ -218,11 +218,9 @@ standard output to be sent to the requestor as an error message when
 it declines the service.
 
 <directory>::
-	The remaining arguments provide a list of directories. If any
-	directories are specified, then the `git-daemon` process will
-	serve a requested directory only if it is contained in one of
-	these directories. If `--strict-paths` is specified, then the
-	requested directory must match one of these directories exactly.
+	A directory to add to the whitelist of allowed directories. Unless
+	--strict-paths is specified this will also include subdirectories
+	of each named directory.
 
 SERVICES
 --------
@@ -266,8 +264,9 @@ git		9418/tcp		# Git Version Control System
 
 'git daemon' as inetd server::
 	To set up 'git daemon' as an inetd service that handles any
-	repository within `/pub/foo` or `/pub/bar`, place an entry like
-	the following into `/etc/inetd` all on one line:
+	repository under the whitelisted set of directories, /pub/foo
+	and /pub/bar, place an entry like the following into
+	/etc/inetd all on one line:
 +
 ------------------------------------------------
 	git stream tcp nowait nobody  /usr/bin/git

Documentation/git-diagnose.txt

@@ -1,65 +0,0 @@
-git-diagnose(1)
-================
-
-NAME
-----
-git-diagnose - Generate a zip archive of diagnostic information
-
-SYNOPSIS
---------
-[verse]
-'git diagnose' [(-o | --output-directory) <path>] [(-s | --suffix) <format>]
-	       [--mode=<mode>]
-
-DESCRIPTION
------------
-Collects detailed information about the user's machine, Git client, and
-repository state and packages that information into a zip archive. The
-generated archive can then, for example, be shared with the Git mailing list to
-help debug an issue or serve as a reference for independent debugging.
-
-By default, the following information is captured in the archive:
-
-  * 'git version --build-options'
-  * The path to the repository root
-  * The available disk space on the filesystem
-  * The name and size of each packfile, including those in alternate object
-    stores
-  * The total count of loose objects, as well as counts broken down by
-    `.git/objects` subdirectory
-
-Additional information can be collected by selecting a different diagnostic mode
-using the `--mode` option.
-
-This tool differs from linkgit:git-bugreport[1] in that it collects much more
-detailed information with a greater focus on reporting the size and data shape
-of repository contents.
-
-OPTIONS
--------
--o <path>::
---output-directory <path>::
-	Place the resulting diagnostics archive in `<path>` instead of the
-	current directory.
-
--s <format>::
---suffix <format>::
-	Specify an alternate suffix for the diagnostics archive name, to create
-	a file named 'git-diagnostics-<formatted suffix>'. This should take the
-	form of a strftime(3) format string; the current local time will be
-	used.
-
---mode=(stats|all)::
-	Specify the type of diagnostics that should be collected. The default behavior
-	of 'git diagnose' is equivalent to `--mode=stats`.
-+
-The `--mode=all` option collects everything included in `--mode=stats`, as well
-as copies of `.git`, `.git/hooks`, `.git/info`, `.git/logs`, and
-`.git/objects/info` directories. This additional information may be sensitive,
-as it can be used to reconstruct the full contents of the diagnosed repository.
-Users should exercise caution when sharing an archive generated with
-`--mode=all`.
-
-GIT
----
-Part of the linkgit:git[1] suite

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

@@ -69,8 +69,8 @@ done an `update-index` to make that effective in the index file.
 matches my working directory. But doing a 'git diff-index' does:
 
   torvalds@ppc970:~/git> git diff-index --cached HEAD
-  :100644 000000 4161aecc6700a2eb579e842af0b7f22b98443f74 0000000000000000000000000000000000000000 D	commit.c
-  :000000 100644 0000000000000000000000000000000000000000 4161aecc6700a2eb579e842af0b7f22b98443f74 A	git-commit.c
+  -100644 blob    4161aecc6700a2eb579e842af0b7f22b98443f74        commit.c
+  +100644 blob    4161aecc6700a2eb579e842af0b7f22b98443f74        git-commit.c
 
 You can see easily that the above is a rename.
 
@@ -103,7 +103,7 @@ have not actually done a 'git update-index' on it yet - there is no
 "object" associated with the new state, and you get:
 
   torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
-  :100644 100644 7476bb5ba 000000000 M	kernel/sched.c
+  :100644 100664 7476bb... 000000...      kernel/sched.c
 
 i.e., it shows that the tree has changed, and that `kernel/sched.c` is
 not up to date and may contain new stuff. The all-zero sha1 means that to

Documentation/git-diff.txt

@@ -79,10 +79,10 @@ If --merge-base is given, use the merge base of the two commits for the
 
 	This form is to view the results of a merge commit.  The first
 	listed <commit> must be the merge itself; the remaining two or
-	more commits should be its parents.  Convenient ways to produce
-	the desired set of revisions are to use the suffixes `^@` and
-	`^!`.  If A is a merge commit, then `git diff A A^@`,
-	`git diff A^!` and `git show A` all give the same combined diff.
+	more commits should be its parents.  A convenient way to produce
+	the desired set of revisions is to use the `^@` suffix.
+	For instance, if `master` names a merge commit, `git diff master
+	master^@` gives the same combined diff as `git show master`.
 
 'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
 
@@ -213,13 +213,6 @@ $ git diff -R                          <2>
     rewrites (very expensive).
 <2> Output diff in reverse.
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/diff.txt[]
-
 SEE ALSO
 --------
 diff(1),

Documentation/git-difftool.txt

@@ -113,14 +113,33 @@ instead.  `--no-symlinks` is the default on Windows.
 
 See linkgit:git-diff[1] for the full list of supported options.
 
-CONFIGURATION
--------------
+CONFIG VARIABLES
+----------------
 'git difftool' falls back to 'git mergetool' config variables when the
 difftool equivalents have not been defined.
 
-include::includes/cmd-config-section-rest.txt[]
+diff.tool::
+	The default diff tool to use.
 
-include::config/difftool.txt[]
+diff.guitool::
+	The default diff tool to use when `--gui` is specified.
+
+difftool.<tool>.path::
+	Override the path for the given tool.  This is useful in case
+	your tool is not in the PATH.
+
+difftool.<tool>.cmd::
+	Specify the command to invoke the specified diff tool.
++
+See the `--tool=<tool>` option above for more details.
+
+difftool.prompt::
+	Prompt before each invocation of the diff tool.
+
+difftool.trustExitCode::
+	Exit difftool if the invoked diff tool returns a non-zero exit status.
++
+See the `--trust-exit-code` option above for more details.
 
 SEE ALSO
 --------

Documentation/git-fast-export.txt

@@ -9,7 +9,7 @@ git-fast-export - Git data exporter
 SYNOPSIS
 --------
 [verse]
-'git fast-export' [<options>] | 'git fast-import'
+'git fast-export [<options>]' | 'git fast-import'
 
 DESCRIPTION
 -----------

Documentation/git-fast-import.txt

@@ -1564,13 +1564,6 @@ operator can use this facility to peek at the objects and refs from an
 import in progress, at the cost of some added running time and worse
 compression.
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/fastimport.txt[]
-
 SEE ALSO
 --------
 linkgit:git-fast-export[1]

Documentation/git-fetch.txt

@@ -285,13 +285,6 @@ linkgit:git-gc[1]).
 
 include::transfer-data-leaks.txt[]
 
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/fetch.txt[]
-
 BUGS
 ----
 Using --recurse-submodules can only fetch new commits in submodules that are

Documentation/git-format-patch.txt

@@ -275,17 +275,6 @@ header). Note also that `git send-email` already handles this
 transformation for you, and this option should not be used if you are
 feeding the result to `git send-email`.
 
---[no-]force-in-body-from::
-	With the e-mail sender specified via the `--from` option, by
-	default, an in-body "From:" to identify the real author of
-	the commit is added at the top of the commit log message if
-	the sender is different from the author.  With this option,
-	the in-body "From:" is added even when the sender and the
-	author have the same name and address, which may help if the
-	mailing list software mangles the sender's identity.
-	Defaults to the value of the `format.forceInBodyFrom`
-	configuration variable.
-
 --add-header=<header>::
 	Add an arbitrary header to the email headers.  This is in addition
 	to any configured headers, and may be used multiple times.

Documentation/git-fsck.txt

@@ -107,8 +107,6 @@ care about this output and want to speed it up further.
 CONFIGURATION
 -------------
 
-include::includes/cmd-config-section-all.txt[]
-
 include::config/fsck.txt[]
 
 DISCUSSION
@@ -152,18 +150,6 @@ hash mismatch <object>::
 	object database value.
 	This indicates a serious data integrity problem.
 
-
-FSCK MESSAGES
--------------
-
-The following lists the types of errors `git fsck` detects and what
-each error means, with their default severity.  The severity of the
-error, other than those that are marked as "(FATAL)", can be tweaked
-by setting the corresponding `fsck.<msg-id>` configuration variable.
-
-include::fsck-msgids.txt[]
-
-
 Environment Variables
 ---------------------
 

Documentation/git-fsmonitor--daemon.txt

@@ -3,7 +3,7 @@ git-fsmonitor{litdd}daemon(1)
 
 NAME
 ----
-git-fsmonitor--daemon - A Built-in Filesystem Monitor
+git-fsmonitor--daemon - A Built-in File System Monitor
 
 SYNOPSIS
 --------
@@ -17,7 +17,7 @@ DESCRIPTION
 -----------
 
 A daemon to watch the working directory for file and directory
-changes using platform-specific filesystem notification facilities.
+changes using platform-specific file system notification facilities.
 
 This daemon communicates directly with commands like `git status`
 using the link:technical/api-simple-ipc.html[simple IPC] interface
@@ -63,44 +63,13 @@ CAVEATS
 -------
 
 The fsmonitor daemon does not currently know about submodules and does
-not know to filter out filesystem events that happen within a
+not know to filter out file system events that happen within a
 submodule.  If fsmonitor daemon is watching a super repo and a file is
 modified within the working directory of a submodule, it will report
 the change (as happening against the super repo).  However, the client
 will properly ignore these extra events, so performance may be affected
 but it will not cause an incorrect result.
 
-By default, the fsmonitor daemon refuses to work against network-mounted
-repositories; this may be overridden by setting `fsmonitor.allowRemote` to
-`true`. Note, however, that the fsmonitor daemon is not guaranteed to work
-correctly with all network-mounted repositories and such use is considered
-experimental.
-
-On Mac OS, the inter-process communication (IPC) between various Git
-commands and the fsmonitor daemon is done via a Unix domain socket (UDS) -- a
-special type of file -- which is supported by native Mac OS filesystems,
-but not on network-mounted filesystems, NTFS, or FAT32.  Other filesystems
-may or may not have the needed support; the fsmonitor daemon is not guaranteed
-to work with these filesystems and such use is considered experimental.
-
-By default, the socket is created in the `.git` directory, however, if the
-`.git` directory is on a network-mounted filesystem, it will be instead be
-created at `$HOME/.git-fsmonitor-*` unless `$HOME` itself is on a
-network-mounted filesystem in which case you must set the configuration
-variable `fsmonitor.socketDir` to the path of a directory on a Mac OS native
-filesystem in which to create the socket file.
-
-If none of the above directories (`.git`, `$HOME`, or `fsmonitor.socketDir`)
-is on a native Mac OS file filesystem the fsmonitor daemon will report an
-error that will cause the daemon and the currently running command to exit.
-
-CONFIGURATION
--------------
-
-include::includes/cmd-config-section-all.txt[]
-
-include::config/fsmonitor--daemon.txt[]
-
 GIT
 ---
 Part of the linkgit:git[1] suite

Documentation/git-gc.txt

@@ -54,10 +54,6 @@ other housekeeping tasks (e.g. rerere, working trees, reflog...) will
 be performed as well.
 
 
---cruft::
-	When expiring unreachable objects, pack them separately into a
-	cruft pack instead of storing them as loose objects.
-
 --prune=<date>::
 	Prune loose objects older than date (default is 2 weeks ago,
 	overridable by the config variable `gc.pruneExpire`).
@@ -110,7 +106,8 @@ users and their repositories.
 CONFIGURATION
 -------------
 
-include::includes/cmd-config-section-all.txt[]
+The below documentation is the same as what's found in
+linkgit:git-config[1]:
 
 include::config/gc.txt[]