Git 2.34.3

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

.github/workflows/check-whitespace.yml

@@ -1,9 +1,8 @@
 name: check-whitespace
 
-# Get the repository with all commits to ensure that we can analyze
-# all of the commits contributed via the Pull Request.
+# Get the repo with the commits(+1) in the series.
 # Process `git log --check` output to extract just the check errors.
-# Exit with failure upon white-space issues.
+# Add a comment to the pull request with the check errors.
 
 on:
   pull_request:

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: CI
+name: CI/PR
 
 on: [push, pull_request]
 
@@ -7,7 +7,6 @@ env:
 
 jobs:
   ci-config:
-    name: config
     runs-on: ubuntu-latest
     outputs:
       enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }}
@@ -78,7 +77,6 @@ jobs:
             }
 
   windows-build:
-    name: win build
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     runs-on: windows-latest
@@ -99,7 +97,6 @@ jobs:
         name: windows-artifacts
         path: artifacts
   windows-test:
-    name: win test
     runs-on: windows-latest
     needs: [windows-build]
     strategy:
@@ -130,7 +127,6 @@ jobs:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   vs-build:
-    name: win+VS build
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     env:
@@ -182,7 +178,6 @@ jobs:
         name: vs-artifacts
         path: artifacts
   vs-test:
-    name: win+VS test
     runs-on: windows-latest
     needs: vs-build
     strategy:
@@ -215,7 +210,6 @@ jobs:
         name: failed-tests-windows
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   regular:
-    name: ${{matrix.vector.jobname}} (${{matrix.vector.pool}})
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     strategy:
@@ -225,25 +219,14 @@ jobs:
           - jobname: linux-clang
             cc: clang
             pool: ubuntu-latest
-          - jobname: linux-sha256
-            cc: clang
-            os: ubuntu
-            pool: ubuntu-latest
           - jobname: linux-gcc
             cc: gcc
-            cc_package: gcc-8
-            pool: ubuntu-latest
-          - jobname: linux-TEST-vars
-            cc: gcc
-            os: ubuntu
-            cc_package: gcc-8
             pool: ubuntu-latest
           - jobname: osx-clang
             cc: clang
             pool: macos-latest
           - jobname: osx-gcc
             cc: gcc
-            cc_package: gcc-9
             pool: macos-latest
           - jobname: linux-gcc-default
             cc: gcc
@@ -253,9 +236,7 @@ jobs:
             pool: ubuntu-latest
     env:
       CC: ${{matrix.vector.cc}}
-      CC_PACKAGE: ${{matrix.vector.cc_package}}
       jobname: ${{matrix.vector.jobname}}
-      runs_on_pool: ${{matrix.vector.pool}}
     runs-on: ${{matrix.vector.pool}}
     steps:
     - uses: actions/checkout@v2
@@ -270,7 +251,6 @@ jobs:
         name: failed-tests-${{matrix.vector.jobname}}
         path: ${{env.FAILED_TEST_ARTIFACTS}}
   dockerized:
-    name: ${{matrix.vector.jobname}} (${{matrix.vector.image}})
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     strategy:
@@ -279,8 +259,7 @@ jobs:
         vector:
         - jobname: linux-musl
           image: alpine
-        - jobname: linux32
-          os: ubuntu32
+        - jobname: Linux32
           image: daald/ubuntu32:xenial
         - jobname: pedantic
           image: fedora
@@ -310,7 +289,6 @@ jobs:
     - uses: actions/checkout@v2
     - run: ci/install-dependencies.sh
     - run: ci/run-static-analysis.sh
-    - run: ci/check-directional-formatting.bash
   sparse:
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
@@ -332,7 +310,6 @@ jobs:
       run: ci/install-dependencies.sh
     - run: make sparse
   documentation:
-    name: documentation
     needs: ci-config
     if: needs.ci-config.outputs.enabled == 'yes'
     env:

.gitignore

@@ -72,13 +72,11 @@
 /git-format-patch
 /git-fsck
 /git-fsck-objects
-/git-fsmonitor--daemon
 /git-gc
 /git-get-tar-commit-id
 /git-grep
 /git-hash-object
 /git-help
-/git-hook
 /git-http-backend
 /git-http-fetch
 /git-http-push

.mailmap

@@ -59,9 +59,8 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
 David S. Miller <davem@davemloft.net>
 David Turner <novalis@novalis.org> <dturner@twopensource.com>
 David Turner <novalis@novalis.org> <dturner@twosigma.com>
-Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
-Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
-Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
+Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
+Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
 Deskin Miller <deskinm@umich.edu>
 Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
 Dirk Süsserott <newsletter@dirk.my1.cc>

.travis.yml

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

CODE_OF_CONDUCT.md

@@ -70,8 +70,8 @@ git@sfconservancy.org, or individually:
 
   - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
   - Christian Couder <christian.couder@gmail.com>
+  - Jeff King <peff@peff.net>
   - Junio C Hamano <gitster@pobox.com>
-  - Taylor Blau <me@ttaylorr.com>
 
 All complaints will be reviewed and investigated promptly and fairly.
 

Documentation/CodingGuidelines

@@ -26,13 +26,6 @@ code.  For Git in general, a few rough rules are:
    go and fix it up."
    Cf. http://lkml.iu.edu/hypermail/linux/kernel/1001.3/01069.html
 
- - Log messages to explain your changes are as important as the
-   changes themselves.  Clearly written code and in-code comments
-   explain how the code works and what is assumed from the surrounding
-   context.  The log messages explain what the changes wanted to
-   achieve and why the changes were necessary (more on this in the
-   accompanying SubmittingPatches document).
-
 Make your code readable and sensible, and don't try to be clever.
 
 As for more concrete guidelines, just imitate the existing code
@@ -217,9 +210,6 @@ For C programs:
    . since mid 2017 with 512f41cf, we have been using designated
      initializers for array (e.g. "int array[10] = { [5] = 2 }").
 
-   . since early 2021 with 765dc168882, we have been using variadic
-     macros, mostly for printf-like trace and debug macros.
-
    These used to be forbidden, but we have not heard any breakage
    report, and they are assumed to be safe.
 
@@ -227,10 +217,7 @@ For C programs:
    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.
+   is still not allowed in this codebase.
 
  - NULL pointers shall be written as NULL, not as 0.
 
@@ -512,33 +499,6 @@ For Python scripts:
  - Where required libraries do not restrict us to Python 2, we try to
    also be compatible with Python 3.1 and later.
 
-
-Program Output
-
- We make a distinction between a Git command's primary output and
- output which is merely chatty feedback (for instance, status
- messages, running transcript, or progress display), as well as error
- messages. Roughly speaking, a Git command's primary output is that
- which one might want to capture to a file or send down a pipe; its
- chatty output should not interfere with these use-cases.
-
- As such, primary output should be sent to the standard output stream
- (stdout), and chatty output should be sent to the standard error
- stream (stderr). Examples of commands which produce primary output
- include `git log`, `git show`, and `git branch --list` which generate
- output on the stdout stream.
-
- Not all Git commands have primary output; this is often true of
- commands whose main function is to perform an action. Some action
- commands are silent, whereas others are chatty. An example of a
- chatty action commands is `git clone` with its "Cloning into
- '<path>'..." and "Checking connectivity..." status messages which it
- sends to the stderr stream.
-
- Error messages from Git commands should always be sent to the stderr
- stream.
-
-
 Error Messages
 
  - Do not end error messages with a full stop.

Documentation/Makefile

@@ -1,6 +1,3 @@
-# Import tree-wide shared Makefile behavior and libraries
-include ../shared.mak
-
 # Guard against environment variables
 MAN1_TXT =
 MAN5_TXT =
@@ -218,6 +215,38 @@ DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR))
 ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
 endif
 
+QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1  =
+
+ifneq ($(findstring $(MAKEFLAGS),w),w)
+PRINT_DIR = --no-print-directory
+else # "make -w"
+NO_SUBDIR = :
+endif
+
+ifneq ($(findstring $(MAKEFLAGS),s),s)
+ifndef V
+	QUIET		= @
+	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;
+	QUIET_XMLTO	= @echo '   ' XMLTO $@;
+	QUIET_DB2TEXI	= @echo '   ' DB2TEXI $@;
+	QUIET_MAKEINFO	= @echo '   ' MAKEINFO $@;
+	QUIET_DBLATEX	= @echo '   ' DBLATEX $@;
+	QUIET_XSLTPROC	= @echo '   ' XSLTPROC $@;
+	QUIET_GEN	= @echo '   ' GEN $@;
+	QUIET_STDERR	= 2> /dev/null
+	QUIET_SUBDIR0	= +@subdir=
+	QUIET_SUBDIR1	= ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
+			  $(MAKE) $(PRINT_DIR) -C $$subdir
+
+	QUIET_LINT_GITLINK	= @echo '   ' LINT GITLINK $<;
+	QUIET_LINT_MANSEC	= @echo '   ' LINT MAN SEC $<;
+	QUIET_LINT_MANEND	= @echo '   ' LINT MAN END $<;
+
+	export V
+endif
+endif
+
 all: html man
 
 html: $(DOC_HTML)
@@ -434,11 +463,25 @@ quick-install-html: require-htmlrepo
 print-man1:
 	@for i in $(MAN1_TXT); do echo $$i; done
 
+## Lint: Common
+.build:
+	$(QUIET)mkdir $@
+.build/lint-docs: | .build
+	$(QUIET)mkdir $@
+
 ## Lint: gitlink
+.build/lint-docs/gitlink: | .build/lint-docs
+	$(QUIET)mkdir $@
+.build/lint-docs/gitlink/howto: | .build/lint-docs/gitlink
+	$(QUIET)mkdir $@
+.build/lint-docs/gitlink/config: | .build/lint-docs/gitlink
+	$(QUIET)mkdir $@
 LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/howto
+$(LINT_DOCS_GITLINK): | .build/lint-docs/gitlink/config
 $(LINT_DOCS_GITLINK): lint-gitlink.perl
 $(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt
-	$(call mkdir_p_parent_template)
 	$(QUIET_LINT_GITLINK)$(PERL_PATH) lint-gitlink.perl \
 		$< \
 		$(HOWTO_TXT) $(DOC_DEP_TXT) \
@@ -449,18 +492,23 @@ $(LINT_DOCS_GITLINK): .build/lint-docs/gitlink/%.ok: %.txt
 lint-docs-gitlink: $(LINT_DOCS_GITLINK)
 
 ## Lint: man-end-blurb
+.build/lint-docs/man-end-blurb: | .build/lint-docs
+	$(QUIET)mkdir $@
 LINT_DOCS_MAN_END_BLURB = $(patsubst %.txt,.build/lint-docs/man-end-blurb/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_END_BLURB): | .build/lint-docs/man-end-blurb
 $(LINT_DOCS_MAN_END_BLURB): lint-man-end-blurb.perl
 $(LINT_DOCS_MAN_END_BLURB): .build/lint-docs/man-end-blurb/%.ok: %.txt
-	$(call mkdir_p_parent_template)
 	$(QUIET_LINT_MANEND)$(PERL_PATH) lint-man-end-blurb.perl $< >$@
 .PHONY: lint-docs-man-end-blurb
+lint-docs-man-end-blurb: $(LINT_DOCS_MAN_END_BLURB)
 
 ## Lint: man-section-order
+.build/lint-docs/man-section-order: | .build/lint-docs
+	$(QUIET)mkdir $@
 LINT_DOCS_MAN_SECTION_ORDER = $(patsubst %.txt,.build/lint-docs/man-section-order/%.ok,$(MAN_TXT))
+$(LINT_DOCS_MAN_SECTION_ORDER): | .build/lint-docs/man-section-order
 $(LINT_DOCS_MAN_SECTION_ORDER): lint-man-section-order.perl
 $(LINT_DOCS_MAN_SECTION_ORDER): .build/lint-docs/man-section-order/%.ok: %.txt
-	$(call mkdir_p_parent_template)
 	$(QUIET_LINT_MANSEC)$(PERL_PATH) lint-man-section-order.perl $< >$@
 .PHONY: lint-docs-man-section-order
 lint-docs-man-section-order: $(LINT_DOCS_MAN_SECTION_ORDER)
@@ -476,4 +524,7 @@ doc-l10n install-l10n::
 	$(MAKE) -C po $@
 endif
 
+# Delete the target file on error
+.DELETE_ON_ERROR:
+
 .PHONY: FORCE

Documentation/MyFirstContribution.txt

@@ -905,34 +905,19 @@ Sending emails with Git is a two-part process; before you can prepare the emails
 themselves, you'll need to prepare the patches. Luckily, this is pretty simple:
 
 ----
-$ git format-patch --cover-letter -o psuh/ --base=auto psuh@{u}..psuh
+$ git format-patch --cover-letter -o psuh/ master..psuh
 ----
 
- . The `--cover-letter` option tells `format-patch` to create a
-   cover letter template for you. You will need to fill in the
-   template before you're ready to send - but for now, the template
-   will be next to your other patches.
+The `--cover-letter` parameter tells `format-patch` to create a cover letter
+template for you. You will need to fill in the template before you're ready
+to send - but for now, the template will be next to your other patches.
 
- . The `-o psuh/` option tells `format-patch` to place the patch
-   files into a directory. This is useful because `git send-email`
-   can take a directory and send out all the patches from there.
+The `-o psuh/` parameter tells `format-patch` to place the patch files into a
+directory. This is useful because `git send-email` can take a directory and
+send out all the patches from there.
 
- . The `--base=auto` option tells the command to record the "base
-   commit", on which the recipient is expected to apply the patch
-   series.  The `auto` value will cause `format-patch` to compute
-   the base commit automatically, which is the merge base of tip
-   commit of the remote-tracking branch and the specified revision
-   range.
-
- . The `psuh@{u}..psuh` option tells `format-patch` to generate
-   patches for the commits you created on the `psuh` branch since it
-   forked from its upstream (which is `origin/master` if you
-   followed the example in the "Set up your workspace" section).  If
-   you are already on the `psuh` branch, you can just say `@{u}`,
-   which means "commits on the current branch since it forked from
-   its upstream", which is the same thing.
-
-The command will make one patch file per commit. After you
+`master..psuh` tells `format-patch` to generate patches for the difference
+between `master` and `psuh`. It will make one patch file per commit. After you
 run, you can go have a look at each of the patches with your favorite text
 editor and make sure everything looks alright; however, it's not recommended to
 make code fixups via the patch file. It's a better idea to make the change the

Documentation/MyFirstObjectWalk.txt

@@ -58,19 +58,14 @@ running, enable trace output by setting the environment variable `GIT_TRACE`.
 
 Add usage text and `-h` handling, like all subcommands should consistently do
 (our test suite will notice and complain if you fail to do so).
-We'll need to include the `parse-options.h` header.
 
 ----
-#include "parse-options.h"
-
-...
-
 int cmd_walken(int argc, const char **argv, const char *prefix)
 {
 	const char * const walken_usage[] = {
 		N_("git walken"),
 		NULL,
-	};
+	}
 	struct option options[] = {
 		OPT_END()
 	};
@@ -200,14 +195,9 @@ Similarly to the default values, we don't have anything to do here yet
 ourselves; however, we should call `git_default_config()` if we aren't calling
 any other existing config callbacks.
 
-Add a new function to `builtin/walken.c`.
-We'll also need to include the `config.h` header:
+Add a new function to `builtin/walken.c`:
 
 ----
-#include "config.h"
-
-...
-
 static int git_walken_config(const char *var, const char *value, void *cb)
 {
 	/*
@@ -239,14 +229,8 @@ typically done by calling `repo_init_revisions()` with the repository you intend
 to target, as well as the `prefix` argument of `cmd_walken` and your `rev_info`
 struct.
 
-Add the `struct rev_info` and the `repo_init_revisions()` call.
-We'll also need to include the `revision.h` header:
-
+Add the `struct rev_info` and the `repo_init_revisions()` call:
 ----
-#include "revision.h"
-
-...
-
 int cmd_walken(int argc, const char **argv, const char *prefix)
 {
 	/* This can go wherever you like in your declarations.*/
@@ -522,25 +506,24 @@ function shows that the all-object walk is being performed by
 `traverse_commit_list()` or `traverse_commit_list_filtered()`. Those two
 functions reside in `list-objects.c`; examining the source shows that, despite
 the name, these functions traverse all kinds of objects. Let's have a look at
-the arguments to `traverse_commit_list()`.
+the arguments to `traverse_commit_list_filtered()`, which are a superset of the
+arguments to the unfiltered version.
 
-- `struct rev_info *revs`: This is the `rev_info` used for the walk. If
-  its `filter` member is not `NULL`, then `filter` contains information for
-  how to filter the object list.
+- `struct list_objects_filter_options *filter_options`: This is a struct which
+  stores a filter-spec as outlined in `Documentation/rev-list-options.txt`.
+- `struct rev_info *revs`: This is the `rev_info` used for the walk.
 - `show_commit_fn show_commit`: A callback which will be used to handle each
   individual commit object.
 - `show_object_fn show_object`: A callback which will be used to handle each
   non-commit object (so each blob, tree, or tag).
 - `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 paramter:
-
 - `struct oidset *omitted`: A linked-list of object IDs which the provided
   filter caused to be omitted.
 
-It looks like these methods use callbacks we provide instead of needing us
-to call it repeatedly ourselves. Cool! Let's add the callbacks first.
+It looks like this `traverse_commit_list_filtered()` uses callbacks we provide
+instead of needing us to call it repeatedly ourselves. Cool! Let's add the
+callbacks first.
 
 For the sake of this tutorial, we'll simply keep track of how many of each kind
 of object we find. At file scope in `builtin/walken.c` add the following
@@ -641,14 +624,9 @@ static void walken_object_walk(struct rev_info *rev)
 ----
 
 Let's start by calling just the unfiltered walk and reporting our counts.
-Complete your implementation of `walken_object_walk()`.
-We'll also need to include the `list-objects.h` header.
+Complete your implementation of `walken_object_walk()`:
 
 ----
-#include "list-objects.h"
-
-...
-
 	traverse_commit_list(rev, walken_show_commit, walken_show_object, NULL);
 
 	printf("commits %d\nblobs %d\ntags %d\ntrees %d\n", commit_count,
@@ -713,9 +691,20 @@ help understand. In our case, that means we omit trees and blobs not directly
 referenced by `HEAD` or `HEAD`'s history, because we begin the walk with only
 `HEAD` in the `pending` list.)
 
+First, we'll need to `#include "list-objects-filter-options.h"` and set up the
+`struct list_objects_filter_options` at the top of the function.
+
+----
+static void walken_object_walk(struct rev_info *rev)
+{
+	struct list_objects_filter_options filter_options = {};
+
+	...
+----
+
 For now, we are not going to track the omitted objects, so we'll replace those
 parameters with `NULL`. For the sake of simplicity, we'll add a simple
-build-time branch to use our filter or not. Preface the line calling
+build-time branch to use our filter or not. Replace the line calling
 `traverse_commit_list()` with the following, which will remind us which kind of
 walk we've just performed:
 
@@ -723,17 +712,19 @@ walk we've just performed:
 	if (0) {
 		/* Unfiltered: */
 		trace_printf(_("Unfiltered object walk.\n"));
+		traverse_commit_list(rev, walken_show_commit,
+				walken_show_object, NULL);
 	} else {
 		trace_printf(
 			_("Filtered object walk with filterspec 'tree:1'.\n"));
-		CALLOC_ARRAY(rev->filter, 1);
-		parse_list_objects_filter(rev->filter, "tree:1");
+		parse_list_objects_filter(&filter_options, "tree:1");
+
+		traverse_commit_list_filtered(&filter_options, rev,
+			walken_show_commit, walken_show_object, NULL, NULL);
 	}
-	traverse_commit_list(rev, walken_show_commit,
-			     walken_show_object, NULL);
 ----
 
-The `rev->filter` member is usually built directly from a command
+`struct list_objects_filter_options` is usually built directly from a command
 line argument, so the module provides an easy way to build one from a string.
 Even though we aren't taking user input right now, we can still build one with
 a hardcoded string using `parse_list_objects_filter()`.
@@ -772,7 +763,7 @@ object:
 ----
 	...
 
-		traverse_commit_list_filtered(rev,
+		traverse_commit_list_filtered(&filter_options, rev,
 			walken_show_commit, walken_show_object, NULL, &omitted);
 
 	...

Documentation/RelNotes/2.30.3.txt

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

Documentation/RelNotes/2.30.4.txt

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

Documentation/RelNotes/2.31.2.txt

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

Documentation/RelNotes/2.31.3.txt

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

Documentation/RelNotes/2.32.1.txt

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

Documentation/RelNotes/2.32.2.txt

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

Documentation/RelNotes/2.33.2.txt

@@ -0,0 +1,15 @@
+Git v2.33.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.30.3, v2.31.2
+and v2.32.1 to address the security issue CVE-2022-24765; see
+the release notes for these versions for details.
+
+In addition, it contains the following fixes:
+
+ * Squelch over-eager warning message added during this cycle.
+
+ * A bug in "git rebase -r" has been fixed.
+
+ * One CI task based on Fedora image noticed a not-quite-kosher
+   construct recently, which has been corrected.

Documentation/RelNotes/2.33.3.txt

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

Documentation/RelNotes/2.34.2.txt

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

Documentation/RelNotes/2.34.3.txt

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

Documentation/RelNotes/2.35.0.txt

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

Documentation/RelNotes/2.35.1.txt

@@ -1,6 +0,0 @@
-Git v2.35.1 Release Notes
-=========================
-
-Git 2.35 shipped with a regression that broke use of "rebase" and
-"stash" in a secondary worktree.  This maintenance release ought to
-fix it.

Documentation/RelNotes/2.36.0.txt

@@ -1,430 +0,0 @@
-Git 2.36 Release Notes
-======================
-
-Updates since Git 2.35
-----------------------
-
-Backward compatibility warts
-
- * "git name-rev --stdin" has been deprecated and issues a warning
-   when used; use "git name-rev --annotate-stdin" instead.
-
- * "git clone --filter=... --recurse-submodules" only makes the
-   top-level a partial clone, while submodules are fully cloned.  This
-   behaviour is changed to pass the same filter down to the submodules.
-
-
-Note to those who build from the source
-
- * Since Git 2.31, our source assumed that the compiler you use to
-   build Git supports variadic macros, with an easy-to-use escape
-   hatch to allow compilation without variadic macros with an request
-   to report that you had to use the escape hatch to the list.
-   Because we haven't heard from anybody who actually needed to use
-   the escape hatch, it has been removed, making support of variadic
-   macros a hard requirement.
-
-
-UI, Workflows & Features
-
- * Assorted updates to "git cat-file", especially "-h".
-
- * The command line completion (in contrib/) learns to complete
-   arguments to give to "git sparse-checkout" command.
-
- * "git log --remerge-diff" shows the difference from mechanical merge
-   result and the result that is actually recorded in a merge commit.
-
- * "git log" and friends learned an option --exclude-first-parent-only
-   to propagate UNINTERESTING bit down only along the first-parent
-   chain, just like --first-parent option shows commits that lack the
-   UNINTERESTING bit only along the first-parent chain.
-
- * The command line completion script (in contrib/) learned to
-   complete all Git subcommands, including the ones that are normally
-   hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used.
-
- * "git branch" learned the "--recurse-submodules" option.
-
- * A not-so-common mistake is to write a script to feed "git bisect
-   run" without making it executable, in which case all tests will
-   exit with 126 or 127 error codes, even on revisions that are marked
-   as good.  Try to recognize this situation and stop iteration early.
-
- * When "index-pack" dies due to incoming data exceeding the maximum
-   allowed input size, include the value of the limit in the error
-   message.
-
- * The error message given by "git switch HEAD~4" has been clarified
-   to suggest the "--detach" option that is required.
-
- * In sparse-checkouts, files mis-marked as missing from the working tree
-   could lead to later problems.  Such files were hard to discover, and
-   harder to correct.  Automatically detecting and correcting the marking
-   of such files has been added to avoid these problems.
-
- * "git cat-file" learns "--batch-command" mode, which is a more
-   flexible interface than the existing "--batch" or "--batch-check"
-   modes, to allow different kinds of inquiries made.
-
- * The level of verbose output from the ort backend during inner merge
-   has been aligned to that of the recursive backend.
-
- * "git remote rename A B", depending on the number of remote-tracking
-   refs involved, takes long time renaming them.  The command has been
-   taught to show progress bar while making the user wait.
-
- * Bundle file format gets extended to allow a partial bundle,
-   filtered by similar criteria you would give when making a
-   partial/lazy clone.
-
- * A new built-in userdiff driver for kotlin has been added.
-
- * "git repack" learned a new configuration to disable triggering of
-   age-old "update-server-info" command, which is rarely useful these
-   days.
-
- * "git stash" does not allow subcommands it internally runs as its
-   implementation detail, except for "git reset", to emit messages;
-   now "git reset" part has also been squelched.
-
- * "git ls-tree" learns "--oid-only" option, similar to "--name-only",
-   and more generalized "--format" option.
-
- * "git fetch --refetch" learned to fetch everything without telling
-   the other side what we already have, which is useful when you
-   cannot trust what you have in the local object store.
-
- * "git branch" gives hint when branch tracking cannot be established
-   because fetch refspecs from multiple remote repositories overlap.
-
- * "git worktree list --porcelain" did not c-quote pathnames and lock
-   reasons with unsafe bytes correctly, which is worked around by
-   introducing NUL terminated output format with "-z".
-
-
-Performance, Internal Implementation, Development Support etc.
-
- * "git apply" (ab)used the util pointer of the string-list to keep
-   track of how each symbolic link needs to be handled, which has been
-   simplified by using strset.
-
- * Fix a hand-rolled alloca() imitation that may have violated
-   alignment requirement of data being sorted in compatibility
-   implementation of qsort_s() and stable qsort().
-
- * Use the parse-options API in "git reflog" command.
-
- * The conditional inclusion mechanism of configuration files using
-   "[includeIf <condition>]" learns to base its decision on the
-   URL of the remote repository the repository interacts with.
-   (merge 399b198489 jt/conditional-config-on-remote-url later to maint).
-
- * "git name-rev --stdin" does not behave like usual "--stdin" at
-   all.  Start the process of renaming it to "--annotate-stdin".
-   (merge a2585719b3 jc/name-rev-stdin later to maint).
-
- * "git update-index", "git checkout-index", and "git clean" are
-   taught to work better with the sparse checkout feature.
-
- * Use an internal call to reset_head() helper function instead of
-   spawning "git checkout" in "rebase", and update code paths that are
-   involved in the change.
-
- * Messages "ort" merge backend prepares while dealing with conflicted
-   paths were unnecessarily confusing since it did not differentiate
-   inner merges and outer merges.
-
- * Small modernization of the rerere-train script (in contrib/).
-
- * Use designated initializers we started using in mid 2017 in more
-   parts of the codebase that are relatively quiescent.
-
- * Improve failure case behaviour of xdiff library when memory
-   allocation fails.
-
- * General clean-up in reftable implementation, including
-   clarification of the API documentation, tightening the code to
-   honor documented length limit, etc.
-
- * Remove the escape hatch we added when we introduced the weather
-   balloon to use variadic macros unconditionally, to make it official
-   that we now have a hard dependency on the feature.
-
- * Makefile refactoring with a bit of suffixes rule stripping to
-   optimize the runtime overhead.
-
- * "git stash drop" is reimplemented as an internal call to
-   reflog_delete() function, instead of invoking "git reflog delete"
-   via run_command() API.
-
- * Count string_list items in size_t, not "unsigned int".
-
- * The single-key interactive operation used by "git add -p" has been
-   made more robust.
-
- * Remove unneeded <meta http-equiv=content-type...> from gitweb
-   output.
-
- * "git name-rev" learned to use the generation numbers when setting
-   the lower bound of searching commits used to explain the revision,
-   when available, instead of committer time.
-
- * Replace core.fsyncObjectFiles with two new configuration variables,
-   core.fsync and core.fsyncMethod.
-
- * Updates to refs traditionally weren't fsync'ed, but we can
-   configure using core.fsync variable to do so.
-
- * "git reflog" command now uses parse-options API to parse its
-   command line options.
-
-
-Fixes since v2.35
------------------
-
- * "rebase" and "stash" in secondary worktrees are broken in
-   Git 2.35.0, which has been corrected.
-
- * "git pull --rebase" ignored the rebase.autostash configuration
-   variable when the remote history is a descendant of our history,
-   which has been corrected.
-   (merge 3013d98d7a pb/pull-rebase-autostash-fix later to maint).
-
- * "git update-index --refresh" has been taught to deal better with
-   racy timestamps (just like "git status" already does).
-   (merge 2ede073fd2 ms/update-index-racy later to maint).
-
- * Avoid tests that are run under GIT_TRACE2 set from failing
-   unnecessarily.
-   (merge 944d808e42 js/test-unset-trace2-parents later to maint).
-
- * The merge-ort misbehaved when merge.renameLimit configuration is
-   set too low and failed to find all renames.
-   (merge 9ae39fef7f en/merge-ort-restart-optim-fix later to maint).
-
- * We explain that revs come first before the pathspec among command
-   line arguments, but did not spell out that dashed options come
-   before other args, which has been corrected.
-   (merge c11f95010c tl/doc-cli-options-first later to maint).
-
- * "git add -p" rewritten in C regressed hunk splitting in some cases,
-   which has been corrected.
-   (merge 7008ddc645 pw/add-p-hunk-split-fix later to maint).
-
- * "git fetch --negotiate-only" is an internal command used by "git
-   push" to figure out which part of our history is missing from the
-   other side.  It should never recurse into submodules even when
-   fetch.recursesubmodules configuration variable is set, nor it
-   should trigger "gc".  The code has been tightened up to ensure it
-   only does common ancestry discovery and nothing else.
-   (merge de4eaae63a gc/fetch-negotiate-only-early-return later to maint).
-
- * The code path that verifies signatures made with ssh were made to
-   work better on a system with CRLF line endings.
-   (merge caeef01ea7 fs/ssh-signing-crlf later to maint).
-
- * "git sparse-checkout init" failed to write into $GIT_DIR/info
-   directory when the repository was created without one, which has
-   been corrected to auto-create it.
-   (merge 7f44842ac1 jt/sparse-checkout-leading-dir-fix later to maint).
-
- * Cloning from a repository that does not yet have any branches or
-   tags but has other refs resulted in a "remote transport reported
-   error", which has been corrected.
-   (merge dccea605b6 jt/clone-not-quite-empty later to maint).
-
- * Mark in various places in the code that the sparse index and the
-   split index features are mutually incompatible.
-   (merge 451b66c533 js/sparse-vs-split-index later to maint).
-
- * Update the logic to compute alignment requirement for our mem-pool.
-   (merge e38bcc66d8 jc/mem-pool-alignment later to maint).
-
- * Pick a better random number generator and use it when we prepare
-   temporary filenames.
-   (merge 47efda967c bc/csprng-mktemps later to maint).
-
- * Update the contributor-facing documents on proposed log messages.
-   (merge cdba0295b0 jc/doc-log-messages later to maint).
-
- * When "git fetch --prune" failed to prune the refs it wanted to
-   prune, the command issued error messages but exited with exit
-   status 0, which has been corrected.
-   (merge c9e04d905e tg/fetch-prune-exit-code-fix later to maint).
-
- * Problems identified by Coverity in the reftable code have been
-   corrected.
-   (merge 01033de49f hn/reftable-coverity-fixes later to maint).
-
- * A bug that made multi-pack bitmap and the object order out-of-sync,
-   making the .midx data corrupt, has been fixed.
-   (merge f8b60cf99b tb/midx-bitmap-corruption-fix later to maint).
-
- * The build procedure has been taught to notice older version of zlib
-   and enable our replacement uncompress2() automatically.
-   (merge 07564773c2 ab/auto-detect-zlib-compress2 later to maint).
-
- * Interaction between fetch.negotiationAlgorithm and
-   feature.experimental configuration variables has been corrected.
-   (merge 714edc620c en/fetch-negotiation-default-fix later to maint).
-
- * "git diff --diff-filter=aR" is now parsed correctly.
-   (merge 75408ca949 js/diff-filter-negation-fix later to maint).
-
- * When "git subtree" wants to create a merge, it used "git merge" and
-   let it be affected by end-user's "merge.ff" configuration, which
-   has been corrected.
-   (merge 9158a3564a tk/subtree-merge-not-ff-only later to maint).
-
- * Unlike "git apply", "git patch-id" did not handle patches with
-   hunks that has only 1 line in either preimage or postimage, which
-   has been corrected.
-   (merge 757e75c81e jz/patch-id-hunk-header-parsing-fix later to maint).
-
- * "receive-pack" checks if it will do any ref updates (various
-   conditions could reject a push) before received objects are taken
-   out of the temporary directory used for quarantine purposes, so
-   that a push that is known-to-fail will not leave crufts that a
-   future "gc" needs to clean up.
-   (merge 5407764069 cb/clear-quarantine-early-on-all-ref-update-errors later to maint).
-
- * Because a deletion of ref would need to remove it from both the
-   loose ref store and the packed ref store, a delete-ref operation
-   that logically removes one ref may end up invoking ref-transaction
-   hook twice, which has been corrected.
-   (merge 2ed1b64ebd ps/avoid-unnecessary-hook-invocation-with-packed-refs later to maint).
-
- * When there is no object to write .bitmap file for, "git
-   multi-pack-index" triggered an error, instead of just skipping,
-   which has been corrected.
-   (merge eb57277ba3 tb/midx-no-bitmap-for-no-objects later to maint).
-
- * "git cmd -h" outside a repository should error out cleanly for many
-   commands, but instead it hit a BUG(), which has been corrected.
-   (merge 87ad07d735 js/short-help-outside-repo-fix later to maint).
-
- * "working tree" and "per-worktree ref" were in glossary, but
-   "worktree" itself wasn't, which has been corrected.
-   (merge 2df5387ed0 jc/glossary-worktree later to maint).
-
- * L10n support for a few error messages.
-   (merge 3d3c23b3a7 bs/forbid-i18n-of-protocol-token-in-fetch-pack later to maint).
-
- * Test modernization.
-   (merge d4fe066e4b sy/t0001-use-path-is-helper later to maint).
-
- * "git log --graph --graph" used to leak a graph structure, and there
-   was no way to countermand "--graph" that appear earlier on the
-   command line.  A "--no-graph" option has been added and resource
-   leakage has been plugged.
-
- * Error output given in response to an ambiguous object name has been
-   improved.
-   (merge 3a73c1dfaf ab/ambiguous-object-name later to maint).
-
- * "git sparse-checkout" wants to work with per-worktree configuration,
-   but did not work well in a worktree attached to a bare repository.
-   (merge 3ce1138272 ds/sparse-checkout-requires-per-worktree-config later to maint).
-
- * Setting core.untrackedCache to true failed to add the untracked
-   cache extension to the index.
-
- * Workaround we have for versions of PCRE2 before their version 10.36
-   were in effect only for their versions newer than 10.36 by mistake,
-   which has been corrected.
-   (merge 97169fc361 rs/pcre-invalid-utf8-fix-fix later to maint).
-
- * Document Taylor as a new member of Git PLC at SFC.  Welcome.
-   (merge e8d56ca863 tb/coc-plc-update later to maint).
-
- * "git checkout -b branch/with/multi/level/name && git stash" only
-   recorded the last level component of the branch name, which has
-   been corrected.
-
- * "git fetch" can make two separate fetches, but ref updates coming
-   from them were in two separate ref transactions under "--atomic",
-   which has been corrected.
-
- * Check the return value from parse_tree_indirect() to turn segfaults
-   into calls to die().
-   (merge 8d2eaf649a gc/parse-tree-indirect-errors later to maint).
-
- * Newer version of GPGSM changed its output in a backward
-   incompatible way to break our code that parses its output.  It also
-   added more processes our tests need to kill when cleaning up.
-   Adjustments have been made to accommodate these changes.
-   (merge b0b70d54c4 fs/gpgsm-update later to maint).
-
- * The untracked cache newly computed weren't written back to the
-   on-disk index file when there is no other change to the index,
-   which has been corrected.
-
- * "git config -h" did not describe the "--type" option correctly.
-   (merge 5445124fad mf/fix-type-in-config-h later to maint).
-
- * The way generation number v2 in the commit-graph files are
-   (not) handled has been corrected.
-   (merge 6dbf4b8172 ds/commit-graph-gen-v2-fixes later to maint).
-
- * The method to trigger malloc check used in our tests no longer work
-   with newer versions of glibc.
-   (merge baedc59543 ep/test-malloc-check-with-glibc-2.34 later to maint).
-
- * When "git fetch --recurse-submodules" grabbed submodule commits
-   that would be needed to recursively check out newly fetched commits
-   in the superproject, it only paid attention to submodules that are
-   in the current checkout of the superproject.  We now do so for all
-   submodules that have been run "git submodule init" on.
-
- * "git rebase $base $non_branch_commit", when $base is an ancestor or
-   the $non_branch_commit, modified the current branch, which has been
-   corrected.
-
- * When "shallow" information is updated, we forgot to update the
-   in-core equivalent, which has been corrected.
-
- * When creating a loose object file, we didn't report the exact
-   filename of the file we failed to fsync, even though the
-   information was readily available, which has been corrected.
-
- * "git am" can read from the standard input when no mailbox is given
-   on the command line, but the end-user gets no indication when it
-   happens, making Git appear stuck.
-   (merge 7b20af6a06 jc/mailsplit-warn-on-tty later to maint).
-
- * "git mv" failed to refresh the cached stat information for the
-   entry it moved.
-   (merge b7f9130a06 vd/mv-refresh-stat later to maint).
-
- * Other code cleanup, docfix, build fix, etc.
-   (merge cfc5cf428b jc/find-header later to maint).
-   (merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).
-   (merge 727e6ea350 jh/p4-spawning-external-commands-cleanup later to maint).
-   (merge 0a6adc26e2 rs/grep-expr-cleanup later to maint).
-   (merge 4ed7dfa713 po/readme-mention-contributor-hints later to maint).
-   (merge 6046f7a91c en/plug-leaks-in-merge later to maint).
-   (merge 8c591dbfce bc/clarify-eol-attr later to maint).
-   (merge 518e15db74 rs/parse-options-lithelp-help later to maint).
-   (merge cbac0076ef gh/doc-typos later to maint).
-   (merge ce14de03db ab/no-errno-from-resolve-ref-unsafe later to maint).
-   (merge 2826ffad8c rc/negotiate-only-typofix later to maint).
-   (merge 0f03f04c5c en/sparse-checkout-leakfix later to maint).
-   (merge 74f3390dde sy/diff-usage-typofix later to maint).
-   (merge 45d0212a71 ll/doc-mktree-typofix later to maint).
-   (merge e9b272e4c1 js/no-more-legacy-stash later to maint).
-   (merge 6798b08e84 ab/do-not-hide-failures-in-git-dot-pm later to maint).
-   (merge 9325285df4 po/doc-check-ignore-markup-fix later to maint).
-   (merge cd26cd6c7c sy/modernize-t-lib-read-tree-m-3way later to maint).
-   (merge d17294a05e ab/hash-object-leakfix later to maint).
-   (merge b8403129d3 jd/t0015-modernize later to maint).
-   (merge 332acc248d ds/mailmap later to maint).
-   (merge 04bf052eef ab/grep-patterntype later to maint).
-   (merge 6ee36364eb ab/diff-free-more later to maint).
-   (merge 63a36017fe nj/read-tree-doc-reffix later to maint).
-   (merge eed36fce38 sm/no-git-in-upstream-of-pipe-in-tests later to maint).
-   (merge c614beb933 ep/t6423-modernize later to maint).
-   (merge 57be9c6dee ab/reflog-prep-fix later to maint).
-   (merge 5327d8982a js/in-place-reverse-in-sequencer later to maint).
-   (merge 2e2c0be51e dp/worktree-repair-in-usage later to maint).
-   (merge 6563706568 jc/coding-guidelines-decl-in-for-loop later to maint).

Documentation/SubmittingPatches

@@ -19,10 +19,8 @@ change is relevant to.
   base your work on the tip of the topic.
 
 * A new feature should be based on `master` in general. If the new
-  feature depends on other topics that are in `next`, but not in
-  `master`, fork a branch from the tip of `master`, merge these topics
-  to the branch, and work on that branch.  You can remind yourself of
-  how you prepared the base with `git log --first-parent master..`.
+  feature depends on a topic that is in `seen`, but not in `master`,
+  base your work on the tip of that topic.
 
 * Corrections and enhancements to a topic not yet in `master` should
   be based on the tip of that topic. If the topic has not been merged
@@ -30,10 +28,10 @@ change is relevant to.
   into the series.
 
 * In the exceptional case that a new feature depends on several topics
-  not in `master`, start working on `next` or `seen` privately and
-  send out patches only for discussion. Once your new feature starts
-  to stabilize, you would have to rebase it (see the "depends on other
-  topics" above).
+  not in `master`, start working on `next` or `seen` privately and send
+  out patches for discussion. Before the final merge, you may have to
+  wait until some of the dependent topics graduate to `master`, and
+  rebase your work.
 
 * Some parts of the system have dedicated maintainers with their own
   repositories (see the section "Subsystems" below).  Changes to
@@ -73,13 +71,8 @@ Make sure that you have tests for the bug you are fixing.  See
 [[tests]]
 When adding a new feature, make sure that you have new tests to show
 the feature triggers the new behavior when it should, and to show the
-feature does not trigger when it shouldn't.  After any code change,
-make sure that the entire test suite passes.  When fixing a bug, make
-sure you have new tests that break if somebody else breaks what you
-fixed by accident to avoid regression.  Also, try merging your work to
-'next' and 'seen' and make sure the tests still pass; topics by others
-that are still in flight may have unexpected interactions with what
-you are trying to do in your topic.
+feature does not trigger when it shouldn't.  After any code change, make
+sure that the entire test suite passes.
 
 Pushing to a fork of https://github.com/git/git will use their CI
 integration to test your changes on Linux, Mac and Windows. See the
@@ -110,35 +103,6 @@ run `git diff --check` on your changes before you commit.
 [[describe-changes]]
 === Describe your changes well.
 
-The log message that explains your changes is just as important as the
-changes themselves.  Your code may be clearly written with in-code
-comment to sufficiently explain how it works with the surrounding
-code, but those who need to fix or enhance your code in the future
-will need to know _why_ your code does what it does, for a few
-reasons:
-
-. Your code may be doing something differently from what you wanted it
-  to do.  Writing down what you actually wanted to achieve will help
-  them fix your code and make it do what it should have been doing
-  (also, you often discover your own bugs yourself, while writing the
-  log message to summarize the thought behind it).
-
-. Your code may be doing things that were only necessary for your
-  immediate needs (e.g. "do X to directories" without implementing or
-  even designing what is to be done on files).  Writing down why you
-  excluded what the code does not do will help guide future developers.
-  Writing down "we do X to directories, because directories have
-  characteristic Y" would help them infer "oh, files also have the same
-  characteristic Y, so perhaps doing X to them would also make sense?".
-  Saying "we don't do the same X to files, because ..." will help them
-  decide if the reasoning is sound (in which case they do not waste
-  time extending your code to cover files), or reason differently (in
-  which case, they can explain why they extend your code to cover
-  files, too).
-
-The goal of your log message is to convey the _why_ behind your
-change to help future developers.
-
 The first line of the commit message should be a short description (50
 characters is the soft limit, see DISCUSSION in linkgit:git-commit[1]),
 and should skip the full stop.  It is also conventional in most cases to
@@ -171,13 +135,6 @@ The body should provide a meaningful commit message, which:
 
 . alternate solutions considered but discarded, if any.
 
-[[present-tense]]
-The problem statement that describes the status quo is written in the
-present tense.  Write "The code does X when it is given input Y",
-instead of "The code used to do Y when given input X".  You do not
-have to say "Currently"---the status quo in the problem statement is
-about the code _without_ your change, by project convention.
-
 [[imperative-mood]]
 Describe your changes in imperative mood, e.g. "make xyzzy do frotz"
 instead of "[This patch] makes xyzzy do frotz" or "[I] changed xyzzy
@@ -187,21 +144,8 @@ without external resources. Instead of giving a URL to a mailing list
 archive, summarize the relevant points of the discussion.
 
 [[commit-reference]]
-
-There are a few reasons why you may want to refer to another commit in
-the "more stable" part of the history (i.e. on branches like `maint`,
-`master`, and `next`):
-
-. A commit that introduced the root cause of a bug you are fixing.
-
-. A commit that introduced a feature that you are enhancing.
-
-. A commit that conflicts with your work when you made a trial merge
-  of your work into `next` and `seen` for testing.
-
-When you reference a commit on a more stable branch (like `master`,
-`maint` and `next`), use the format "abbreviated hash (subject,
-date)", like this:
+If you want to reference a previous commit in the history of a stable
+branch, use the format "abbreviated hash (subject, date)", like this:
 
 ....
 	Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
@@ -315,11 +259,9 @@ Please make sure your patch does not add commented out debugging code,
 or include any extra files which do not relate to what your patch
 is trying to achieve. Make sure to review
 your patch after generating it, to ensure accuracy.  Before
-sending out, please make sure it cleanly applies to the base you
-have chosen in the "Decide what to base your work on" section,
-and unless it targets the `master` branch (which is the default),
-mark your patches as such.
-
+sending out, please make sure it cleanly applies to the `master`
+branch head.  If you are preparing a work based on "next" branch,
+that is fine, but please mark it as such.
 
 [[send-patches]]
 === Sending your patches.
@@ -423,10 +365,7 @@ Security mailing list{security-ml-ref}.
 Send your patch with "To:" set to the mailing list, with "cc:" listing
 people who are involved in the area you are touching (the `git
 contacts` command in `contrib/contacts/` can help to
-identify them), to solicit comments and reviews.  Also, when you made
-trial merges of your topic to `next` and `seen`, you may have noticed
-work by others conflicting with your changes.  There is a good possibility
-that these people may know the area you are touching well.
+identify them), to solicit comments and reviews.
 
 :current-maintainer: footnote:[The current maintainer: gitster@pobox.com]
 :git-ml: footnote:[The mailing list: git@vger.kernel.org]

Documentation/config.txt

@@ -159,33 +159,6 @@ all branches that begin with `foo/`. This is useful if your branches are
 organized hierarchically and you would like to apply a configuration to
 all the branches in that hierarchy.
 
-`hasconfig:remote.*.url:`::
-	The data that follows this keyword is taken to
-	be a pattern with standard globbing wildcards and two
-	additional ones, `**/` and `/**`, that can match multiple
-	components. The first time this keyword is seen, the rest of
-	the config files will be scanned for remote URLs (without
-	applying any values). If there exists at least one remote URL
-	that matches this pattern, the include condition is met.
-+
-Files included by this option (directly or indirectly) are not allowed
-to contain remote URLs.
-+
-Note that unlike other includeIf conditions, resolving this condition
-relies on information that is not yet known at the point of reading the
-condition. A typical use case is this option being present as a
-system-level or global-level config, and the remote URL being in a
-local-level config; hence the need to scan ahead when resolving this
-condition. In order to avoid the chicken-and-egg problem in which
-potentially-included files can affect whether such files are potentially
-included, Git breaks the cycle by prohibiting these files from affecting
-the resolution of these conditions (thus, prohibiting them from
-declaring remote URLs).
-+
-As for the naming of this keyword, it is for forwards compatibiliy with
-a naming scheme that supports more variable-based include conditions,
-but currently Git only supports the exact keyword described above.
-
 A few more notes on matching via `gitdir` and `gitdir/i`:
 
  * Symlinks in `$GIT_DIR` are not resolved before matching.
@@ -253,14 +226,6 @@ Example
 ; currently checked out
 [includeIf "onbranch:foo-branch"]
 	path = foo.inc
-
-; include only if a remote with the given URL exists (note
-; that such a URL may be provided later in a file or in a
-; file read after this file is read, as seen in this example)
-[includeIf "hasconfig:remote.*.url:https://example.com/**"]
-	path = foo.inc
-[remote "origin"]
-	url = https://example.com/git
 ----
 
 Values
@@ -297,19 +262,11 @@ color::
        colors (at most two, one for foreground and one for background)
        and attributes (as many as you want), separated by spaces.
 +
-The basic colors accepted are `normal`, `black`, `red`, `green`,
-`yellow`, `blue`, `magenta`, `cyan`, `white` and `default`.  The first
-color given is the foreground; the second is the background.  All the
-basic colors except `normal` and `default` have a bright variant that can
-be specified by prefixing the color with `bright`, like `brightred`.
-+
-The color `normal` makes no change to the color. It is the same as an
-empty string, but can be used as the foreground color when specifying a
-background color alone (for example, "normal red").
-+
-The color `default` explicitly resets the color to the terminal default,
-for example to specify a cleared background. Although it varies between
-terminals, this is usually not the same as setting to "white black".
+The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
+`blue`, `magenta`, `cyan` and `white`.  The first color given is the
+foreground; the second is the background.  All the basic colors except
+`normal` have a bright variant that can be specified by prefixing the
+color with `bright`, like `brightred`.
 +
 Colors may also be given as numbers between 0 and 255; these use ANSI
 256-color mode (but note that not all terminals may support this).  If
@@ -323,11 +280,6 @@ The position of any attributes with respect to the colors
 be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
 `no-ul`, etc).
 +
-The pseudo-attribute `reset` resets all colors and attributes before
-applying the specified coloring. For example, `reset green` will result
-in a green foreground and default background without any active
-attributes.
-+
 An empty color string produces no color effect at all. This can be used
 to avoid coloring specific elements without disabling color entirely.
 +
@@ -495,14 +447,16 @@ include::config/repack.txt[]
 
 include::config/rerere.txt[]
 
+include::config/reset.txt[]
+
+include::config/safe.txt[]
+
 include::config/sendemail.txt[]
 
 include::config/sequencer.txt[]
 
 include::config/showbranch.txt[]
 
-include::config/sparse.txt[]
-
 include::config/splitindex.txt[]
 
 include::config/ssh.txt[]

Documentation/config/advice.txt

@@ -4,10 +4,6 @@ advice.*::
 	can tell Git that you do not need help by setting these to 'false':
 +
 --
-	ambiguousFetchRefspec::
-		Advice shown when fetch refspec for multiple remotes map to
-		the same remote-tracking branch namespace and causes branch
-		tracking set-up to fail.
 	fetchShowForcedUpdates::
 		Advice shown when linkgit:git-fetch[1] takes a long time
 		to calculate forced updates after ref updates, or to warn
@@ -71,10 +67,10 @@ advice.*::
 	commitBeforeMerge::
 		Advice shown when linkgit:git-merge[1] refuses to
 		merge to avoid overwriting local changes.
-	resetNoRefresh::
-		Advice to consider using the `--no-refresh` option to
-		linkgit:git-reset[1] when the command takes more than 2 seconds
-		to refresh the index after reset.
+	resetQuiet::
+		Advice to consider using the `--quiet` option to linkgit:git-reset[1]
+		when the command takes more than 2 seconds to enumerate unstaged
+		changes after reset.
 	resolveConflict::
 		Advice shown by various commands when conflicts
 		prevent the operation from being performed.
@@ -89,9 +85,6 @@ advice.*::
 		linkgit:git-switch[1] or linkgit:git-checkout[1]
 		to move to the detach HEAD state, to instruct how to
 		create a local branch after the fact.
-	suggestDetachingHead::
-		Advice shown when linkgit:git-switch[1] refuses to detach HEAD
-		without the explicit `--detach` option.
 	checkoutAmbiguousRemoteBranchName::
 		Advice shown when the argument to
 		linkgit:git-checkout[1] and linkgit:git-switch[1]
@@ -123,9 +116,6 @@ advice.*::
 	submoduleAlternateErrorStrategyDie::
 		Advice shown when a submodule.alternateErrorStrategy option
 		configured to "die" causes a fatal error.
-	submodulesNotUpdated::
-		Advice shown when a user runs a submodule command that fails
-		because `git submodule update --init` was not run.
 	addIgnoredFile::
 		Advice shown if a user attempts to add an ignored file to
 		the index.

Documentation/config/branch.txt

@@ -7,8 +7,7 @@ branch.autoSetupMerge::
 	automatic setup is done; `true` -- automatic setup is done when the
 	starting point is a remote-tracking branch; `always` --
 	automatic setup is done when the starting point is either a
-	local branch or remote-tracking branch; `inherit` -- if the starting point
-	has a tracking configuration, it is copied to the new
+	local branch or remote-tracking
 	branch. This option defaults to true.
 
 branch.autoSetupRebase::

Documentation/config/clone.txt

@@ -6,8 +6,3 @@ clone.defaultRemoteName::
 clone.rejectShallow::
 	Reject to clone a repository if it is a shallow one, can be overridden by
 	passing option `--reject-shallow` in command line. See linkgit:git-clone[1]
-
-clone.filterSubmodules::
-	If a partial clone filter is provided (see `--filter` in
-	linkgit:git-rev-list[1]) and `--recurse-submodules` is used, also apply
-	the filter to submodules.

Documentation/config/core.txt

@@ -62,54 +62,22 @@ core.protectNTFS::
 	Defaults to `true` on Windows, and `false` elsewhere.
 
 core.fsmonitor::
-	If set to true, enable the built-in file system monitor
-	daemon for this working directory (linkgit:git-fsmonitor--daemon[1]).
-+
-Like hook-based file system monitors, the built-in file system monitor
-can speed up Git commands that need to refresh the Git index
-(e.g. `git status`) in a working directory with many files.  The
-built-in monitor eliminates the need to install and maintain an
-external third-party tool.
-+
-The built-in file system monitor is currently available only on a
-limited set of supported platforms.  Currently, this includes Windows
-and MacOS.
-+
-	Otherwise, this variable contains the pathname of the "fsmonitor"
-	hook command.
-+
-This hook command is used to identify all files that may have changed
-since the requested date/time. This information is used to speed up
-git by avoiding unnecessary scanning of files that have not changed.
-+
-See the "fsmonitor-watchman" section of linkgit:githooks[5].
-+
-Note that if you concurrently use multiple versions of Git, such
-as one version on the command line and another version in an IDE
-tool, that the definition of `core.fsmonitor` was extended to
-allow boolean values in addition to hook pathnames.  Git versions
-2.35.1 and prior will not understand the boolean values and will
-consider the "true" or "false" values as hook pathnames to be
-invoked.  Git versions 2.26 thru 2.35.1 default to hook protocol
-V2 and will fall back to no fsmonitor (full scan).  Git versions
-prior to 2.26 default to hook protocol V1 and will silently
-assume there were no changes to report (no scan), so status
-commands may report incomplete results.  For this reason, it is
-best to upgrade all of your Git versions before using the built-in
-file system monitor.
+	If set, the value of this variable is used as a command which
+	will identify all files that may have changed since the
+	requested date/time. This information is used to speed up git by
+	avoiding unnecessary processing of files that have not changed.
+	See the "fsmonitor-watchman" section of linkgit:githooks[5].
 
 core.fsmonitorHookVersion::
-	Sets the protocol version to be used when invoking the
-	"fsmonitor" hook.
-+
-There are currently versions 1 and 2. When this is not set,
-version 2 will be tried first and if it fails then version 1
-will be tried. Version 1 uses a timestamp as input to determine
-which files have changes since that time but some monitors
-like Watchman have race conditions when used with a timestamp.
-Version 2 uses an opaque string so that the monitor can return
-something that can be used to determine what files have changed
-without race conditions.
+	Sets the version of hook that is to be used when calling fsmonitor.
+	There are currently versions 1 and 2. When this is not set,
+	version 2 will be tried first and if it fails then version 1
+	will be tried. Version 1 uses a timestamp as input to determine
+	which files have changes since that time but some monitors
+	like watchman have race conditions when used with a timestamp.
+	Version 2 uses an opaque string so that the monitor can return
+	something that can be used to determine what files have changed
+	without race conditions.
 
 core.trustctime::
 	If false, the ctime differences between the index and the
@@ -579,64 +547,13 @@ core.whitespace::
   is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`
   errors. The default tab width is 8. Allowed values are 1 to 63.
 
-core.fsync::
-	A comma-separated list of components of the repository that
-	should be hardened via the core.fsyncMethod when created or
-	modified.  You can disable hardening of any component by
-	prefixing it with a '-'.  Items that are not hardened may be
-	lost in the event of an unclean	system shutdown. Unless you
-	have special requirements, it is recommended that you leave
-	this option empty or pick one of `committed`, `added`,
-	or `all`.
-+
-When this configuration is encountered, the set of components starts with
-the platform default value, disabled components are removed, and additional
-components are added. `none` resets the state so that the platform default
-is ignored.
-+
-The empty string resets the fsync configuration to the platform
-default. The default on most platforms is equivalent to
-`core.fsync=committed,-loose-object`, which has good performance,
-but risks losing recent work in the event of an unclean system shutdown.
-+
-* `none` clears the set of fsynced components.
-* `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.
-* `index` hardens the index when it is modified.
-* `objects` is an aggregate option that is equivalent to
-  `loose-object,pack`.
-* `reference` hardens references modified in the repo.
-* `derived-metadata` is an aggregate option that is equivalent to
-  `pack-metadata,commit-graph`.
-* `committed` is an aggregate option that is currently equivalent to
-  `objects`. This mode sacrifices some performance to ensure that work
-  that is committed to the repository with `git commit` or similar commands
-  is hardened.
-* `added` is an aggregate option that is currently equivalent to
-  `committed,index`. This mode sacrifices additional performance to
-  ensure that the results of commands like `git add` and similar operations
-  are hardened.
-* `all` is an aggregate option that syncs all individual components above.
-
-core.fsyncMethod::
-	A value indicating the strategy Git will use to harden repository data
-	using fsync and related primitives.
-+
-* `fsync` uses the fsync() system call or platform equivalents.
-* `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.
-
 core.fsyncObjectFiles::
 	This boolean will enable 'fsync()' when writing object files.
-	This setting is deprecated. Use core.fsync instead.
 +
-This setting affects data added to the Git repository in loose-object
-form. When set to true, Git will issue an fsync or similar system call
-to flush caches so that loose-objects remain consistent in the face
-of a unclean system shutdown.
+This is a total waste of time and effort on a filesystem that orders
+data writes properly, but can be useful for filesystems that do not use
+journalling (traditional UNIX filesystems) or that only journal metadata
+and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
 
 core.preloadIndex::
 	Enable parallel index preload for operations like 'git diff'

Documentation/config/extensions.txt

@@ -6,34 +6,3 @@ extensions.objectFormat::
 Note that this setting should only be set by linkgit:git-init[1] or
 linkgit:git-clone[1].  Trying to change it after initialization will not
 work and will produce hard-to-diagnose issues.
-
-extensions.worktreeConfig::
-	If enabled, then worktrees will load config settings from the
-	`$GIT_DIR/config.worktree` file in addition to the
-	`$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and
-	`$GIT_DIR` are the same for the main working tree, while other
-	working trees have `$GIT_DIR` equal to
-	`$GIT_COMMON_DIR/worktrees/<id>/`. The settings in the
-	`config.worktree` file will override settings from any other
-	config files.
-+
-When enabling `extensions.worktreeConfig`, you must be careful to move
-certain values from the common config file to the main working tree's
-`config.worktree` file, if present:
-+
-* `core.worktree` must be moved from `$GIT_COMMON_DIR/config` to
-  `$GIT_COMMON_DIR/config.worktree`.
-* If `core.bare` is true, then it must be moved from `$GIT_COMMON_DIR/config`
-  to `$GIT_COMMON_DIR/config.worktree`.
-+
-It may also be beneficial to adjust the locations of `core.sparseCheckout`
-and `core.sparseCheckoutCone` depending on your desire for customizable
-sparse-checkout settings for each worktree. By default, the `git
-sparse-checkout` builtin enables `extensions.worktreeConfig`, assigns
-these config values on a per-worktree basis, and uses the
-`$GIT_DIR/info/sparse-checkout` file to specify the sparsity for each
-worktree independently. See linkgit:git-sparse-checkout[1] for more
-details.
-+
-For historical reasons, `extensions.worktreeConfig` is respected
-regardless of the `core.repositoryFormatVersion` setting.

Documentation/config/fetch.txt

@@ -56,19 +56,18 @@ fetch.output::
 	OUTPUT in linkgit:git-fetch[1] for detail.
 
 fetch.negotiationAlgorithm::
-	Control how information about the commits in the local repository
-	is sent when negotiating the contents of the packfile to be sent by
-	the server.  Set to "consecutive" to use an algorithm that walks
-	over consecutive commits checking each one.  Set to "skipping" to
-	use an algorithm that skips commits in an effort to converge
-	faster, but may result in a larger-than-necessary packfile; or set
-	to "noop" to not send any information at all, which will almost
-	certainly result in a larger-than-necessary packfile, but will skip
-	the negotiation step.  Set to "default" to override settings made
-	previously and use the default behaviour.  The default is normally
-	"consecutive", but if `feature.experimental` is true, then the
-	default is "skipping".  Unknown values will cause 'git fetch' to
-	error out.
+	Control how information about the commits in the local repository is
+	sent when negotiating the contents of the packfile to be sent by the
+	server. Set to "skipping" to use an algorithm that skips commits in an
+	effort to converge faster, but may result in a larger-than-necessary
+	packfile; or set to "noop" to not send any information at all, which
+	will almost certainly result in a larger-than-necessary packfile, but
+	will skip the negotiation step.
+	The default is "default" which instructs Git to use the default algorithm
+	that never skips commits (unless the server has acknowledged it or one
+	of its descendants). If `feature.experimental` is enabled, then this
+	setting defaults to "skipping".
+	Unknown values will cause 'git fetch' to error out.
 +
 See also the `--negotiate-only` and `--negotiation-tip` options to
 linkgit:git-fetch[1].

Documentation/config/gpg.txt

@@ -34,17 +34,17 @@ gpg.minTrustLevel::
 * `fully`
 * `ultimate`
 
-gpg.ssh.defaultKeyCommand::
+gpg.ssh.defaultKeyCommand:
 	This command that will be run when user.signingkey is not set and a ssh
 	signature is requested. On successful exit a valid ssh public key is
-	expected in the first line of its output. To automatically use the first
+	expected in the	first line of its output. To automatically use the first
 	available key from your ssh-agent set this to "ssh-add -L".
 
 gpg.ssh.allowedSignersFile::
 	A file containing ssh public keys which you are willing to trust.
 	The file consists of one or more lines of principals followed by an ssh
 	public key.
-	e.g.: `user1@example.com,user2@example.com ssh-rsa AAAAX1...`
+	e.g.: user1@example.com,user2@example.com ssh-rsa AAAAX1...
 	See ssh-keygen(1) "ALLOWED SIGNERS" for details.
 	The principal is only used to identify the key and is available when
 	verifying a signature.
@@ -64,11 +64,6 @@ A repository that only allows signed commits can store the file
 in the repository itself using a path relative to the top-level of the working tree.
 This way only committers with an already valid key can add or change keys in the keyring.
 +
-Since OpensSSH 8.8 this file allows specifying a key lifetime using valid-after &
-valid-before options. Git will mark signatures as valid if the signing key was
-valid at the time of the signature's creation. This allows users to change a
-signing key without invalidating all previously made signatures.
-+
 Using a SSH CA key with the cert-authority option
 (see ssh-keygen(1) "CERTIFICATES") is also valid.
 

Documentation/config/grep.txt

@@ -8,8 +8,7 @@ grep.patternType::
 	Set the default matching behavior. Using a value of 'basic', 'extended',
 	'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
 	`--fixed-strings`, or `--perl-regexp` option accordingly, while the
-	value 'default' will use the `grep.extendedRegexp` option to choose
-	between 'basic' and 'extended'.
+	value 'default' will return to the default matching behavior.
 
 grep.extendedRegexp::
 	If set to true, enable `--extended-regexp` option by default. This

Documentation/config/merge.txt

@@ -4,14 +4,7 @@ merge.conflictStyle::
 	shows a `<<<<<<<` conflict marker, changes made by one side,
 	a `=======` marker, changes made by the other side, and then
 	a `>>>>>>>` marker.  An alternate style, "diff3", adds a `|||||||`
-	marker and the original text before the `=======` marker.  The
-	"merge" style tends to produce smaller conflict regions than diff3,
-	both because of the exclusion of the original text, and because
-	when a subset of lines match on the two sides they are just pulled
-	out of the conflict region.  Another alternate style, "zdiff3", is
-	similar to diff3 but removes matching lines on the two sides from
-	the conflict region when those matching lines appear near either
-	the beginning or end of a conflict region.
+	marker and the original text before the `=======` marker.
 
 merge.defaultToUpstream::
 	If merge is called without any commit argument, merge the upstream

Documentation/config/remote.txt

@@ -82,7 +82,5 @@ remote.<name>.promisor::
 	objects.
 
 remote.<name>.partialclonefilter::
-	The filter that will be applied when fetching from this	promisor remote.
-	Changing or clearing this value will only affect fetches for new commits.
-	To fetch associated objects for commits already present in the local object
-	database, use the `--refetch` option of linkgit:git-fetch[1].
+	The filter that will be applied when fetching from this
+	promisor remote.

Documentation/config/repack.txt

@@ -25,8 +25,3 @@ repack.writeBitmaps::
 	space and extra time spent on the initial repack.  This has
 	no effect if multiple packfiles are created.
 	Defaults to true on bare repos, false otherwise.
-
-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].

Documentation/config/reset.txt

@@ -0,0 +1,2 @@
+reset.quiet::
+	When set to true, 'git reset' will default to the '--quiet' option.

Documentation/config/safe.txt

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

Documentation/config/sparse.txt

@@ -1,27 +0,0 @@
-sparse.expectFilesOutsideOfPatterns::
-	Typically with sparse checkouts, files not matching any
-	sparsity patterns are marked with a SKIP_WORKTREE bit in the
-	index and are missing from the working tree.  Accordingly, Git
-	will ordinarily check whether files with the SKIP_WORKTREE bit
-	are in fact present in the working tree contrary to
-	expectations.  If Git finds any, it marks those paths as
-	present by clearing the relevant SKIP_WORKTREE bits.  This
-	option can be used to tell Git that such
-	present-despite-skipped files are expected and to stop
-	checking for them.
-+
-The default is `false`, which allows Git to automatically recover
-from the list of files in the index and working tree falling out of
-sync.
-+
-Set this to `true` if you are in a setup where some external factor
-relieves Git of the responsibility for maintaining the consistency
-between the presence of working tree files and sparsity patterns.  For
-example, if you have a Git-aware virtual file system that has a robust
-mechanism for keeping the working tree and the sparsity patterns up to
-date based on access patterns.
-+
-Regardless of this setting, Git does not check for
-present-despite-skipped files unless sparse checkout is enabled, so
-this config option has no effect unless `core.sparseCheckout` is
-`true`.

Documentation/config/stash.txt

@@ -1,3 +1,10 @@
+stash.useBuiltin::
+	Unused configuration variable.  Used in Git versions 2.22 to
+	2.26 as an escape hatch to enable the legacy shellscript
+	implementation of stash.  Now the built-in rewrite of it in C
+	is always used. Setting this will emit a warning, to alert any
+	remaining users that setting this now does nothing.
+
 stash.showIncludeUntracked::
 	If this is set to true, the `git stash show` command will show
 	the untracked files of a stash entry.  Defaults to false. See

Documentation/config/submodule.txt

@@ -59,33 +59,18 @@ submodule.active::
 
 submodule.recurse::
 	A boolean indicating if commands should enable the `--recurse-submodules`
-	option by default. Defaults to false.
-+
-When set to true, it can be deactivated via the
-`--no-recurse-submodules` option. Note that some Git commands
-lacking this option may call some of the above commands affected by
-`submodule.recurse`; for instance `git remote update` will call
-`git fetch` but does not have a `--no-recurse-submodules` option.
-For these commands a workaround is to temporarily change the
-configuration value by using `git -c submodule.recurse=0`.
-+
-The following list shows the commands that accept
-`--recurse-submodules` and whether they are supported by this
-setting.
-
-* `checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`,
-`reset`, `restore` and `switch` are always supported.
-* `clone` and `ls-files` are not supported.
-* `branch` is supported only if `submodule.propagateBranches` is
-enabled
-
-submodule.propagateBranches::
-	[EXPERIMENTAL] A boolean that enables branching support when
-	using `--recurse-submodules` or `submodule.recurse=true`.
-	Enabling this will allow certain commands to accept
-	`--recurse-submodules` and certain commands that already accept
-	`--recurse-submodules` will now consider branches.
+	option by default.
+	Applies to all commands that support this option
+	(`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`,
+	`restore` and `switch`) except `clone` and `ls-files`.
 	Defaults to false.
+	When set to true, it can be deactivated via the
+	`--no-recurse-submodules` option. Note that some Git commands
+	lacking this option may call some of the above commands affected by
+	`submodule.recurse`; for instance `git remote update` will call
+	`git fetch` but does not have a `--no-recurse-submodules` option.
+	For these commands a workaround is to temporarily change the
+	configuration value by using `git -c submodule.recurse=0`.
 
 submodule.fetchJobs::
 	Specifies how many submodules are fetched/cloned at the same time.

Documentation/config/user.txt

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

Documentation/date-formats.txt

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

Documentation/diff-options.txt

@@ -34,7 +34,7 @@ endif::git-diff[]
 endif::git-format-patch[]
 
 ifdef::git-log[]
---diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc|remerge|r)::
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
 --no-diff-merges::
 	Specify diff format to be used for merge commits. Default is
 	{diff-merges-default} unless `--first-parent` is in use, in which case
@@ -64,18 +64,6 @@ ifdef::git-log[]
 	each of the parents. Separate log entry and diff is generated
 	for each parent.
 +
---diff-merges=remerge:::
---diff-merges=r:::
---remerge-diff:::
-	With this option, two-parent merge commits are remerged to
-	create a temporary tree object -- potentially containing files
-	with conflict markers and such.  A diff is then shown between
-	that temporary tree and the actual merge commit.
-+
-The output emitted when this option is used is subject to change, and
-so is its interaction with other options (unless explicitly
-documented).
-+
 --diff-merges=combined:::
 --diff-merges=c:::
 -c:::
@@ -628,8 +616,11 @@ ifndef::git-format-patch[]
 Also, these upper-case letters can be downcased to exclude.  E.g.
 `--diff-filter=ad` excludes added and deleted paths.
 +
-Note that not all diffs can feature all types. For instance, copied and
-renamed entries cannot appear if detection for those types is disabled.
+Note that not all diffs can feature all types. For instance, diffs
+from the index to the working tree can never have Added entries
+(because the set of paths included in the diff is limited by what is in
+the index).  Similarly, copied and renamed entries cannot appear if
+detection for those types is disabled.
 
 -S<string>::
 	Look for differences that change the number of occurrences of

Documentation/fetch-options.txt

@@ -71,7 +71,6 @@ configuration variables documented in linkgit:git-config[1], and the
 	ancestors of the provided `--negotiation-tip=*` arguments,
 	which we have in common with the server.
 +
-This is incompatible with `--recurse-submodules=[yes|on-demand]`.
 Internally this is used to implement the `push.negotiate` option, see
 linkgit:git-config[1].
 
@@ -163,16 +162,6 @@ endif::git-pull[]
 	behavior for a remote may be specified with the remote.<name>.tagOpt
 	setting. See linkgit:git-config[1].
 
-ifndef::git-pull[]
---refetch::
-	Instead of negotiating with the server to avoid transferring commits and
-	associated objects that are already present locally, this option fetches
-	all objects as a fresh clone would. Use this to reapply a partial clone
-	filter from configuration or using `--filter=` when the filter
-	definition has changed. Automatic post-fetch maintenance will perform
-	object database pack consolidation to remove any duplicate objects.
-endif::git-pull[]
-
 --refmap=<refspec>::
 	When fetching refs listed on the command line, use the
 	specified refspec (can be given more than once) to map the
@@ -196,23 +185,15 @@ endif::git-pull[]
 ifndef::git-pull[]
 --recurse-submodules[=yes|on-demand|no]::
 	This option controls if and under what conditions new commits of
-	submodules should be fetched too. When recursing through submodules,
-	`git fetch` always attempts to fetch "changed" submodules, that is, a
-	submodule that has commits that are referenced by a newly fetched
-	superproject commit but are missing in the local submodule clone. A
-	changed submodule can be fetched as long as it is present locally e.g.
-	in `$GIT_DIR/modules/` (see linkgit:gitsubmodules[7]); if the upstream
-	adds a new submodule, that submodule cannot be fetched until it is
-	cloned e.g. by `git submodule update`.
-+
-When set to 'on-demand', only changed submodules are fetched. When set
-to 'yes', all populated submodules are fetched and submodules that are
-both unpopulated and changed are fetched. When set to 'no', submodules
-are never fetched.
-+
-When unspecified, this uses the value of `fetch.recurseSubmodules` if it
-is set (see linkgit:git-config[1]), defaulting to 'on-demand' if unset.
-When this option is used without any value, it defaults to 'yes'.
+	populated submodules should be fetched too. It can be used as a
+	boolean option to completely disable recursion when set to 'no' or to
+	unconditionally recurse into all populated submodules when set to
+	'yes', which is the default when this option is used without any
+	value. Use 'on-demand' to only recurse into a populated submodule
+	when the superproject retrieves a commit that updates the submodule's
+	reference to a commit that isn't already in the local submodule
+	clone. By default, 'on-demand' is used, unless
+	`fetch.recurseSubmodules` is set (see linkgit:git-config[1]).
 endif::git-pull[]
 
 -j::

Documentation/git-am.txt

@@ -16,9 +16,8 @@ SYNOPSIS
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
 	 [--quoted-cr=<action>]
-	 [--empty=(stop|drop|keep)]
 	 [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)] | --allow-empty)
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
 
 DESCRIPTION
 -----------
@@ -64,14 +63,6 @@ OPTIONS
 --quoted-cr=<action>::
 	This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 
---empty=(stop|drop|keep)::
-	By default, or when the option is set to 'stop', the command
-	errors out on an input e-mail message lacking a patch
-	and stops into the middle of the current am session. When this
-	option is set to 'drop', skip such an e-mail message instead.
-	When this option is set to 'keep', create an empty commit,
-	recording the contents of the e-mail message as its log.
-
 -m::
 --message-id::
 	Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
@@ -200,11 +191,6 @@ default.   You can use `--no-utf8` to override this.
 	the e-mail message; if `diff`, show the diff portion only.
 	Defaults to `raw`.
 
---allow-empty::
-	After a patch failure on an input e-mail message lacking a patch,
-	create an empty commit with the contents of the e-mail message
-	as its log message.
-
 DISCUSSION
 ----------
 

Documentation/git-apply.txt

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

Documentation/git-archimport.txt

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

Documentation/git-branch.txt

@@ -16,8 +16,7 @@ SYNOPSIS
 	[--points-at <object>] [--format=<format>]
 	[(-r | --remotes) | (-a | --all)]
 	[--list] [<pattern>...]
-'git branch' [--track[=(direct|inherit)] | --no-track] [-f]
-	[--recurse-submodules] <branchname> [<start-point>]
+'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]
 'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
 'git branch' --unset-upstream [<branchname>]
 'git branch' (-m | -M) [<oldbranch>] <newbranch>
@@ -207,50 +206,24 @@ This option is only applicable in non-verbose mode.
 	Display the full sha1s in the output listing rather than abbreviating them.
 
 -t::
---track[=(direct|inherit)]::
+--track::
 	When creating a new branch, set up `branch.<name>.remote` and
-	`branch.<name>.merge` configuration entries to set "upstream" tracking
-	configuration for the new branch. This
+	`branch.<name>.merge` configuration entries to mark the
+	start-point branch as "upstream" from the new branch. This
 	configuration will tell git to show the relationship between the
 	two branches in `git status` and `git branch -v`. Furthermore,
 	it directs `git pull` without arguments to pull from the
 	upstream when the new branch is checked out.
 +
-The exact upstream branch is chosen depending on the optional argument:
-`-t`, `--track`, or `--track=direct` means to use the start-point branch
-itself as the upstream; `--track=inherit` means to copy the upstream
-configuration of the start-point branch.
-+
-`--track=direct` is the default when the start point is a remote-tracking branch.
+This behavior is the default when the start point is a remote-tracking branch.
 Set the branch.autoSetupMerge configuration variable to `false` if you
 want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track`
 were given. Set it to `always` if you want this behavior when the
-start-point is either a local or remote-tracking branch. Set it to
-`inherit` if you want to copy the tracking configuration from the
-branch point.
-+
-See linkgit:git-pull[1] and linkgit:git-config[1] for additional discussion on
-how the `branch.<name>.remote` and `branch.<name>.merge` options are used.
+start-point is either a local or remote-tracking branch.
 
 --no-track::
 	Do not set up "upstream" configuration, even if the
-	branch.autoSetupMerge configuration variable is set.
-
---recurse-submodules::
-	THIS OPTION IS EXPERIMENTAL! Causes the current command to
-	recurse into submodules if `submodule.propagateBranches` is
-	enabled. See `submodule.propagateBranches` in
-	linkgit:git-config[1]. Currently, only branch creation is
-	supported.
-+
-When used in branch creation, a new branch <branchname> will be created
-in the superproject and all of the submodules in the superproject's
-<start-point>. In submodules, the branch will point to the submodule
-commit in the superproject's <start-point> but the branch's tracking
-information will be set up based on the submodule's branches and remotes
-e.g. `git branch --recurse-submodules topic origin/main` will create the
-submodule branch "topic" that points to the submodule commit in the
-superproject's "origin/main", but tracks the submodule's "origin/main".
+	branch.autoSetupMerge configuration variable is true.
 
 --set-upstream::
 	As this option had confusing syntax, it is no longer supported.

Documentation/git-bundle.txt

@@ -75,11 +75,8 @@ verify <file>::
 	cleanly to the current repository.  This includes checks on the
 	bundle format itself as well as checking that the prerequisite
 	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 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.
+	'git bundle' prints a list of missing commits, if any, and exits
+	with a non-zero status.
 
 list-heads <file>::
 	Lists the references defined in the bundle.  If followed by a

Documentation/git-cat-file.txt

@@ -9,14 +9,8 @@ git-cat-file - Provide content or type and size information for repository objec
 SYNOPSIS
 --------
 [verse]
-'git cat-file' <type> <object>
-'git cat-file' (-e | -p) <object>
-'git cat-file' (-t | -s) [--allow-unknown-type] <object>
-'git cat-file' (--batch | --batch-check) [--batch-all-objects]
-	     [--buffer] [--follow-symlinks] [--unordered]
-	     [--textconv | --filters]
-'git cat-file' (--textconv | --filters)
-	     [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]
+'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>
+'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]
 
 DESCRIPTION
 -----------
@@ -96,33 +90,6 @@ OPTIONS
 	need to specify the path, separated by whitespace.  See the
 	section `BATCH OUTPUT` below for details.
 
---batch-command::
---batch-command=<format>::
-	Enter a command mode that reads commands and arguments from stdin. May
-	only be combined with `--buffer`, `--textconv` or `--filters`. In the
-	case of `--textconv` or `--filters`, the input lines also need to specify
-	the path, separated by whitespace. See the section `BATCH OUTPUT` below
-	for details.
-+
-`--batch-command` recognizes the following commands:
-+
---
-contents <object>::
-	Print object contents for object reference `<object>`. This corresponds to
-	the output of `--batch`.
-
-info <object>::
-	Print object info for object reference `<object>`. This corresponds to the
-	output of `--batch-check`.
-
-flush::
-	Used with `--buffer` to execute all preceding commands that were issued
-	since the beginning or since the last flush was issued. When `--buffer`
-	is used, no output will come until a `flush` is issued. When `--buffer`
-	is not used, commands are flushed each time without issuing `flush`.
---
-+
-
 --batch-all-objects::
 	Instead of reading a list of objects on stdin, perform the
 	requested batch operation on all objects in the repository and
@@ -137,7 +104,7 @@ flush::
 	that a process can interactively read and write from
 	`cat-file`. With this option, the output uses normal stdio
 	buffering; this is much more efficient when invoking
-	`--batch-check` or `--batch-command` on a large number of objects.
+	`--batch-check` on a large number of objects.
 
 --unordered::
 	When `--batch-all-objects` is in use, visit objects in an
@@ -229,13 +196,6 @@ from stdin, one per line, and print information about them. By default,
 the whole line is considered as an object, as if it were fed to
 linkgit:git-rev-parse[1].
 
-When `--batch-command` is given, `cat-file` will read commands from stdin,
-one per line, and print information based on the command given. With
-`--batch-command`, the `info` command followed by an object will print
-information about the object the same way `--batch-check` would, and the
-`contents` command followed by an object prints contents in the same way
-`--batch` would.
-
 You can specify the information shown for each object by using a custom
 `<format>`. The `<format>` is copied literally to stdout for each
 object, with placeholders of the form `%(atom)` expanded, followed by a
@@ -271,9 +231,9 @@ newline. The available atoms are:
 If no format is specified, the default format is `%(objectname)
 %(objecttype) %(objectsize)`.
 
-If `--batch` is specified, or if `--batch-command` is used with the `contents`
-command, the object information is followed by the object contents (consisting
-of `%(objectsize)` bytes), followed by a newline.
+If `--batch` is specified, the object information is followed by the
+object contents (consisting of `%(objectsize)` bytes), followed by a
+newline.
 
 For example, `--batch` without a custom format would produce:
 

Documentation/git-check-ignore.txt

@@ -33,7 +33,7 @@ OPTIONS
 	Instead of printing the paths that are excluded, for each path
 	that matches an exclude pattern, print the exclude pattern
 	together with the path.  (Matching an exclude pattern usually
-	means the path is excluded, but if the pattern begins with "`!`"
+	means the path is excluded, but if the pattern begins with '!'
 	then it is a negated pattern and matching it means the path is
 	NOT excluded.)
 +
@@ -77,7 +77,7 @@ If `--verbose` is specified, the output is a series of lines of the form:
 <pathname> is the path of a file being queried, <pattern> is the
 matching pattern, <source> is the pattern's source file, and <linenum>
 is the line number of the pattern within that source.  If the pattern
-contained a "`!`" prefix or "`/`" suffix, it will be preserved in the
+contained a `!` prefix or `/` suffix, it will be preserved in the
 output.  <source> will be an absolute path when referring to the file
 configured by `core.excludesFile`, or relative to the repository root
 when referring to `.git/info/exclude` or a per-directory exclude file.

Documentation/git-checkout-index.txt

@@ -12,7 +12,6 @@ SYNOPSIS
 'git checkout-index' [-u] [-q] [-a] [-f] [-n] [--prefix=<string>]
 		   [--stage=<number>|all]
 		   [--temp]
-		   [--ignore-skip-worktree-bits]
 		   [-z] [--stdin]
 		   [--] [<file>...]
 
@@ -38,9 +37,8 @@ OPTIONS
 
 -a::
 --all::
-	checks out all files in the index except for those with the
-	skip-worktree bit set (see `--ignore-skip-worktree-bits`).
-	Cannot be used together with explicit filenames.
+	checks out all files in the index.  Cannot be used
+	together with explicit filenames.
 
 -n::
 --no-create::
@@ -61,10 +59,6 @@ OPTIONS
 	write the content to temporary files.  The temporary name
 	associations will be written to stdout.
 
---ignore-skip-worktree-bits::
-	Check out all files, including those with the skip-worktree bit
-	set.
-
 --stdin::
 	Instead of taking list of paths from the command line,
 	read list of paths from the standard input.  Paths are

Documentation/git-checkout.txt

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

Documentation/git-cherry-pick.txt

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

Documentation/git-clone.txt

@@ -9,14 +9,14 @@ git-clone - Clone a repository into a new directory
 SYNOPSIS
 --------
 [verse]
-'git clone' [--template=<template-directory>]
+'git clone' [--template=<template_directory>]
 	  [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]
 	  [-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
-	  [--dissociate] [--separate-git-dir <git-dir>]
+	  [--dissociate] [--separate-git-dir <git dir>]
 	  [--depth <depth>] [--[no-]single-branch] [--no-tags]
 	  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
 	  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
-	  [--filter=<filter> [--also-filter-submodules]] [--] <repository>
+	  [--filter=<filter>] [--] <repository>
 	  [<directory>]
 
 DESCRIPTION
@@ -167,10 +167,10 @@ objects from the source repository into a pack in the cloned repository.
 	configuration variables are created.
 
 --sparse::
-	Employ a sparse-checkout, with only files in the toplevel
-	directory initially being present.  The
-	linkgit:git-sparse-checkout[1] command can be used to grow the
-	working directory as needed.
+	Initialize the sparse-checkout file so the working
+	directory starts with only the files in the root
+	of the repository. The sparse-checkout file can be
+	modified to grow the working directory as needed.
 
 --filter=<filter-spec>::
 	Use the partial clone feature and request that the server sends
@@ -182,11 +182,6 @@ objects from the source repository into a pack in the cloned repository.
 	at least `<size>`. For more details on filter specifications, see
 	the `--filter` option in linkgit:git-rev-list[1].
 
---also-filter-submodules::
-	Also apply the partial clone filter to any submodules in the repository.
-	Requires `--filter` and `--recurse-submodules`. This can be turned on by
-	default by setting the `clone.filterSubmodules` config option.
-
 --mirror::
 	Set up a mirror of the source repository.  This implies `--bare`.
 	Compared to `--bare`, `--mirror` not only maps local branches of the
@@ -216,7 +211,7 @@ objects from the source repository into a pack in the cloned repository.
 	via ssh, this specifies a non-default path for the command
 	run on the other end.
 
---template=<template-directory>::
+--template=<template_directory>::
 	Specify the directory from which templates will be used;
 	(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
 
@@ -299,7 +294,7 @@ or `--mirror` is given)
 	superproject's recorded SHA-1. Equivalent to passing `--remote` to
 	`git submodule update`.
 
---separate-git-dir=<git-dir>::
+--separate-git-dir=<git dir>::
 	Instead of placing the cloned repository where it is supposed
 	to be, place the cloned repository at the specified directory,
 	then make a filesystem-agnostic Git symbolic link to there.

Documentation/git-config.txt

@@ -9,20 +9,20 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] <name> [<value> [<value-pattern>]]
-'git config' [<file-option>] [--type=<type>] --add <name> <value>
-'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all <name> <value> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get <name> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all <name> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp <name-regex> [<value-pattern>]
-'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch <name> <URL>
-'git config' [<file-option>] [--fixed-value] --unset <name> [<value-pattern>]
-'git config' [<file-option>] [--fixed-value] --unset-all <name> [<value-pattern>]
-'git config' [<file-option>] --rename-section <old-name> <new-name>
-'git config' [<file-option>] --remove-section <name>
+'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]
+'git config' [<file-option>] [--type=<type>] --add name value
+'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all name value [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]
+'git config' [<file-option>] [--type=<type>] [-z|--null] --get-urlmatch name URL
+'git config' [<file-option>] [--fixed-value] --unset name [value-pattern]
+'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]
+'git config' [<file-option>] --rename-section old_name new_name
+'git config' [<file-option>] --remove-section name
 'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
-'git config' [<file-option>] --get-color <name> [<default>]
-'git config' [<file-option>] --get-colorbool <name> [<stdout-is-tty>]
+'git config' [<file-option>] --get-color name [default]
+'git config' [<file-option>] --get-colorbool name [stdout-is-tty]
 'git config' [<file-option>] -e | --edit
 
 DESCRIPTION
@@ -102,9 +102,9 @@ OPTIONS
 	in which section and variable names are lowercased, but subsection
 	names are not.
 
---get-urlmatch <name> <URL>::
+--get-urlmatch name URL::
 	When given a two-part name section.key, the value for
-	section.<URL>.key whose <URL> part matches the best to the
+	section.<url>.key whose <url> part matches the best to the
 	given URL is returned (if no such key exists, the value for
 	section.key is used as a fallback).  When given just the
 	section as name, do so for all the keys in the section and
@@ -141,16 +141,12 @@ from all available files.
 See also <<FILES>>.
 
 --worktree::
-	Similar to `--local` except that `$GIT_DIR/config.worktree` is
+	Similar to `--local` except that `.git/config.worktree` is
 	read from or written to if `extensions.worktreeConfig` is
-	enabled. If not it's the same as `--local`. Note that `$GIT_DIR`
-	is equal to `$GIT_COMMON_DIR` for the main working tree, but is of
-	the form `$GIT_DIR/worktrees/<id>/` for other working trees. See
-	linkgit:git-worktree[1] to learn how to enable
-	`extensions.worktreeConfig`.
+	present. If not it's the same as `--local`.
 
--f <config-file>::
---file <config-file>::
+-f config-file::
+--file config-file::
 	For writing options: write to the specified file rather than the
 	repository `.git/config`.
 +
@@ -159,7 +155,7 @@ available files.
 +
 See also <<FILES>>.
 
---blob <blob>::
+--blob blob::
 	Similar to `--file` but use the given blob instead of a file. E.g.
 	you can use 'master:.gitmodules' to read values from the file
 	'.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
@@ -250,18 +246,18 @@ Valid `<type>`'s include:
 	all queried config options with the scope of that value
 	(local, global, system, command).
 
---get-colorbool <name> [<stdout-is-tty>]::
+--get-colorbool name [stdout-is-tty]::
 
-	Find the color setting for `<name>` (e.g. `color.diff`) and output
-	"true" or "false".  `<stdout-is-tty>` should be either "true" or
+	Find the color setting for `name` (e.g. `color.diff`) and output
+	"true" or "false".  `stdout-is-tty` should be either "true" or
 	"false", and is taken into account when configuration says
-	"auto".  If `<stdout-is-tty>` is missing, then checks the standard
+	"auto".  If `stdout-is-tty` is missing, then checks the standard
 	output of the command itself, and exits with status 0 if color
 	is to be used, or exits with status 1 otherwise.
 	When the color setting for `name` is undefined, the command uses
 	`color.ui` as fallback.
 
---get-color <name> [<default>]::
+--get-color name [default]::
 
 	Find the color configured for `name` (e.g. `color.diff.new`) and
 	output it as the ANSI color escape sequence to the standard

Documentation/git-credential.txt

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

Documentation/git-cvsexportcommit.txt

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

Documentation/git-cvsimport.txt

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

Documentation/git-diff-files.txt

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

Documentation/git-diff-index.txt

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

Documentation/git-diff-tree.txt

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

Documentation/git-fetch-pack.txt

@@ -101,10 +101,6 @@ be in a separate packet, and the list must end with a flush packet.
 	current shallow boundary instead of from the tip of each
 	remote branch history.
 
---refetch::
-	Skips negotiating commits with the server in order to fetch all matching
-	objects. Use to reapply a new partial clone blob/tree filter.
-
 --no-progress::
 	Do not show the progress.
 

Documentation/git-fetch.txt

@@ -287,10 +287,12 @@ include::transfer-data-leaks.txt[]
 
 BUGS
 ----
-Using --recurse-submodules can only fetch new commits in submodules that are
-present locally e.g. in `$GIT_DIR/modules/`. If the upstream adds a new
-submodule, that submodule cannot be fetched until it is cloned e.g. by `git
-submodule update`. This is expected to be fixed in a future Git version.
+Using --recurse-submodules can only fetch new commits in already checked
+out submodules right now. When e.g. upstream added a new submodule in the
+just fetched commits of the superproject the submodule itself cannot be
+fetched, making it impossible to check out that submodule later without
+having to do a fetch again. This is expected to be fixed in a future Git
+version.
 
 SEE ALSO
 --------

Documentation/git-fmt-merge-msg.txt

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

Documentation/git-format-patch.txt

@@ -18,7 +18,7 @@ SYNOPSIS
 		   [-n | --numbered | -N | --no-numbered]
 		   [--start-number <n>] [--numbered-files]
 		   [--in-reply-to=<message id>] [--suffix=.<sfx>]
-		   [--ignore-if-in-upstream] [--always]
+		   [--ignore-if-in-upstream]
 		   [--cover-from-description=<mode>]
 		   [--rfc] [--subject-prefix=<subject prefix>]
 		   [(--reroll-count|-v) <n>]
@@ -192,10 +192,6 @@ will want to ensure that threading is disabled for `git send-email`.
 	patches being generated, and any patch that matches is
 	ignored.
 
---always::
-	Include patches for commits that do not introduce any change,
-	which are omitted by default.
-
 --cover-from-description=<mode>::
 	Controls which parts of the cover letter will be automatically
 	populated using the branch's description.

Documentation/git-fsck.txt

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

Documentation/git-fsmonitor--daemon.txt

@@ -1,75 +0,0 @@
-git-fsmonitor--daemon(1)
-========================
-
-NAME
-----
-git-fsmonitor--daemon - A Built-in File System Monitor
-
-SYNOPSIS
---------
-[verse]
-'git fsmonitor--daemon' start
-'git fsmonitor--daemon' run
-'git fsmonitor--daemon' stop
-'git fsmonitor--daemon' status
-
-DESCRIPTION
------------
-
-A daemon to watch the working directory for file and directory
-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
-instead of the slower linkgit:githooks[5] interface.
-
-This daemon is built into Git so that no third-party tools are
-required.
-
-OPTIONS
--------
-
-start::
-	Starts a daemon in the background.
-
-run::
-	Runs a daemon in the foreground.
-
-stop::
-	Stops the daemon running in the current working
-	directory, if present.
-
-status::
-	Exits with zero status if a daemon is watching the
-	current working directory.
-
-REMARKS
--------
-
-This daemon is a long running process used to watch a single working
-directory and maintain a list of the recently changed files and
-directories.  Performance of commands such as `git status` can be
-increased if they just ask for a summary of changes to the working
-directory and can avoid scanning the disk.
-
-When `core.fsmonitor` is set to `true` (see linkgit:git-config[1])
-commands, such as `git status`, will ask the daemon for changes and
-automatically start it (if necessary).
-
-For more information see the "File System Monitor" section in
-linkgit:git-update-index[1].
-
-CAVEATS
--------
-
-The fsmonitor daemon does not currently know about submodules and does
-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.
-
-GIT
----
-Part of the linkgit:git[1] suite

Documentation/git-gui.txt

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

Documentation/git-help.txt

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

Documentation/git-hook.txt

@@ -1,45 +0,0 @@
-git-hook(1)
-===========
-
-NAME
-----
-git-hook - Run git hooks
-
-SYNOPSIS
---------
-[verse]
-'git hook' run [--ignore-missing] <hook-name> [-- <hook-args>]
-
-DESCRIPTION
------------
-
-A command interface to running git hooks (see linkgit:githooks[5]),
-for use by other scripted git commands.
-
-SUBCOMMANDS
------------
-
-run::
-	Run the `<hook-name>` hook. See linkgit:githooks[5] for
-	supported hook names.
-+
-
-Any positional arguments to the hook should be passed after a
-mandatory `--` (or `--end-of-options`, see linkgit:gitcli[7]). See
-linkgit:githooks[5] for arguments hooks might expect (if any).
-
-OPTIONS
--------
-
---ignore-missing::
-	Ignore any missing hook by quietly returning zero. Used for
-	tools that want to do a blind one-shot run of a hook that may
-	or may not be present.
-
-SEE ALSO
---------
-linkgit:githooks[5]
-
-GIT
----
-Part of the linkgit:git[1] suite

Documentation/git-http-fetch.txt

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

Documentation/git-http-push.txt

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

Documentation/git-index-pack.txt

@@ -122,14 +122,6 @@ This option cannot be used with --stdin.
 +
 include::object-format-disclaimer.txt[]
 
---promisor[=<message>]::
-	Before committing the pack-index, create a .promisor file for this
-	pack. Particularly helpful when writing a promisor pack with --fix-thin
-	since the name of the pack is not final until the pack has been fully
-	written. If a `<message>` is provided, then that content will be
-	written to the .promisor file for future reference. See
-	link:technical/partial-clone.html[partial clone] for more information.
-
 NOTES
 -----
 

Documentation/git-init-db.txt

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

Documentation/git-init.txt

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

Documentation/git-log.txt

@@ -9,7 +9,7 @@ git-log - Show commit logs
 SYNOPSIS
 --------
 [verse]
-'git log' [<options>] [<revision-range>] [[--] <path>...]
+'git log' [<options>] [<revision range>] [[--] <path>...]
 
 DESCRIPTION
 -----------
@@ -81,13 +81,13 @@ produced by `--stat`, etc.
 
 include::line-range-options.txt[]
 
-<revision-range>::
+<revision range>::
 	Show only commits in the specified revision range.  When no
-	<revision-range> is specified, it defaults to `HEAD` (i.e. the
+	<revision range> is specified, it defaults to `HEAD` (i.e. the
 	whole history leading to the current commit).  `origin..HEAD`
 	specifies all the commits reachable from the current commit
 	(i.e. `HEAD`), but not from `origin`. For a complete list of
-	ways to spell <revision-range>, see the 'Specifying Ranges'
+	ways to spell <revision range>, see the 'Specifying Ranges'
 	section of linkgit:gitrevisions[7].
 
 [--] <path>...::

Documentation/git-ls-files.txt

@@ -10,9 +10,9 @@ SYNOPSIS
 --------
 [verse]
 'git ls-files' [-z] [-t] [-v] [-f]
-		[-c|--cached] [-d|--deleted] [-o|--others] [-i|--|ignored]
-		[-s|--stage] [-u|--unmerged] [-k|--|killed] [-m|--modified]
-		[--directory [--no-empty-directory]] [--eol]
+		(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
+		(-[c|d|o|i|s|u|k|m])*
+		[--eol]
 		[--deduplicate]
 		[-x <pattern>|--exclude=<pattern>]
 		[-X <file>|--exclude-from=<file>]
@@ -156,7 +156,7 @@ a space) at the start of each line:
 
 --recurse-submodules::
 	Recursively calls ls-files on each active submodule in the repository.
-	Currently there is only support for the --cached and --stage modes.
+	Currently there is only support for the --cached mode.
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
@@ -187,11 +187,6 @@ Both the <eolinfo> in the index ("i/<eolinfo>")
 and in the working tree ("w/<eolinfo>") are shown for regular files,
 followed by the  ("attr/<eolattr>").
 
---sparse::
-	If the index is sparse, show the sparse directories without expanding
-	to the contained files. Sparse directories will be shown with a
-	trailing slash, such as "x/" for a sparse directory "x".
-
 \--::
 	Do not interpret any more arguments as options.
 

Documentation/git-ls-tree.txt

@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git ls-tree' [-d] [-r] [-t] [-l] [-z]
-	    [--name-only] [--name-status] [--object-only] [--full-name] [--full-tree] [--abbrev[=<n>]] [--format=<format>]
+	    [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]
 	    <tree-ish> [<path>...]
 
 DESCRIPTION
@@ -59,15 +59,6 @@ OPTIONS
 --name-only::
 --name-status::
 	List only filenames (instead of the "long" output), one per line.
-	Cannot be combined with `--object-only`.
-
---object-only::
-	List only names of the objects, one per line. Cannot be combined
-	with `--name-only` or `--name-status`.
-	This is equivalent to specifying `--format='%(objectname)'`, but
-	for both this option and that exact format the command takes a
-	hand-optimized codepath instead of going through the generic
-	formatting mechanism.
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
@@ -83,16 +74,6 @@ OPTIONS
 	Do not limit the listing to the current working directory.
 	Implies --full-name.
 
---format=<format>::
-	A string that interpolates `%(fieldname)` from the result
-	being shown. It also interpolates `%%` to `%`, and
-	`%xx` where `xx` are hex digits interpolates to character
-	with hex code `xx`; for example `%00` interpolates to
-	`\0` (NUL), `%09` to `\t` (TAB) and `%0a` to `\n` (LF).
-	When specified, `--format` cannot be combined with other
-	format-altering options, including `--long`, `--name-only`
-	and `--object-only`.
-
 [<path>...]::
 	When paths are given, show them (note that this isn't really raw
 	pathnames, but rather a list of patterns to match).  Otherwise
@@ -101,29 +82,16 @@ OPTIONS
 
 Output Format
 -------------
-
-The output format of `ls-tree` is determined by either the `--format`
-option, or other format-altering options such as `--name-only` etc.
-(see `--format` above).
-
-The use of certain `--format` directives is equivalent to using those
-options, but invoking the full formatting machinery can be slower than
-using an appropriate formatting option.
-
-In cases where the `--format` would exactly map to an existing option
-`ls-tree` will use the appropriate faster path. Thus the default format
-is equivalent to:
-
-	%(objectmode) %(objecttype) %(objectname)%x09%(path)
+        <mode> SP <type> SP <object> TAB <file>
 
 This output format is compatible with what `--index-info --stdin` of
 'git update-index' expects.
 
 When the `-l` option is used, format changes to
 
-	%(objectmode) %(objecttype) %(objectname) %(objectsize:padded)%x09%(path)
+        <mode> SP <type> SP <object> SP <object size> TAB <file>
 
-Object size identified by <objectname> is given in bytes, and right-justified
+Object size identified by <object> is given in bytes, and right-justified
 with minimum width of 7 characters.  Object size is given only for blobs
 (file) entries; for other entries `-` character is used in place of size.
 
@@ -132,34 +100,6 @@ quoted as explained for the configuration variable `core.quotePath`
 (see linkgit:git-config[1]).  Using `-z` the filename is output
 verbatim and the line is terminated by a NUL byte.
 
-Customized format:
-
-It is possible to print in a custom format by using the `--format` option,
-which is able to interpolate different fields using a `%(fieldname)` notation.
-For example, if you only care about the "objectname" and "path" fields, you
-can execute with a specific "--format" like
-
-	git ls-tree --format='%(objectname) %(path)' <tree-ish>
-
-FIELD NAMES
------------
-
-Various values from structured fields can be used to interpolate
-into the resulting output. For each outputing line, the following
-names can be used:
-
-objectmode::
-	The mode of the object.
-objecttype::
-	The type of the object (`blob` or `tree`).
-objectname::
-	The name of the object.
-objectsize[:padded]::
-	The size of the object ("-" if it's a tree).
-	It also supports a padded format of size with "%(size:padded)".
-path::
-	The pathname of the object.
-
 GIT
 ---
 Part of the linkgit:git[1] suite

Documentation/git-maintenance.txt

@@ -10,8 +10,6 @@ SYNOPSIS
 --------
 [verse]
 'git maintenance' run [<options>]
-'git maintenance' start [--scheduler=<scheduler>]
-'git maintenance' (stop|register|unregister)
 
 
 DESCRIPTION
@@ -31,24 +29,6 @@ Git repository.
 SUBCOMMANDS
 -----------
 
-run::
-	Run one or more maintenance tasks. If one or more `--task` options
-	are specified, then those tasks are run in that order. Otherwise,
-	the tasks are determined by which `maintenance.<task>.enabled`
-	config options are true. By default, only `maintenance.gc.enabled`
-	is true.
-
-start::
-	Start running maintenance on the current repository. This performs
-	the same config updates as the `register` subcommand, then updates
-	the background scheduler to run `git maintenance run --scheduled`
-	on an hourly basis.
-
-stop::
-	Halt the background maintenance schedule. The current repository
-	is not removed from the list of maintained repositories, in case
-	the background maintenance is restarted later.
-
 register::
 	Initialize Git config values so any scheduled maintenance will
 	start running on this repository. This adds the repository to the
@@ -75,6 +55,24 @@ task:
 setting `maintenance.auto = false` in the current repository. This config
 setting will remain after a `git maintenance unregister` command.
 
+run::
+	Run one or more maintenance tasks. If one or more `--task` options
+	are specified, then those tasks are run in that order. Otherwise,
+	the tasks are determined by which `maintenance.<task>.enabled`
+	config options are true. By default, only `maintenance.gc.enabled`
+	is true.
+
+start::
+	Start running maintenance on the current repository. This performs
+	the same config updates as the `register` subcommand, then updates
+	the background scheduler to run `git maintenance run --scheduled`
+	on an hourly basis.
+
+stop::
+	Halt the background maintenance schedule. The current repository
+	is not removed from the list of maintained repositories, in case
+	the background maintenance is restarted later.
+
 unregister::
 	Remove the current repository from background maintenance. This
 	only removes the repository from the configured list. It does not

Documentation/git-merge-file.txt

@@ -70,9 +70,6 @@ OPTIONS
 --diff3::
 	Show conflicts in "diff3" style.
 
---zdiff3::
-	Show conflicts in "zdiff3" style.
-
 --ours::
 --theirs::
 --union::

Documentation/git-merge-index.txt

@@ -9,7 +9,7 @@ git-merge-index - Run a merge for files needing merging
 SYNOPSIS
 --------
 [verse]
-'git merge-index' [-o] [-q] <merge-program> (-a | ( [--] <file>...) )
+'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*)
 
 DESCRIPTION
 -----------

Documentation/git-merge.txt

@@ -12,8 +12,7 @@ SYNOPSIS
 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
 	[--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
 	[--[no-]allow-unrelated-histories]
-	[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>]
-	[--into-name <branch>] [<commit>...]
+	[--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
 'git merge' (--continue | --abort | --quit)
 
 DESCRIPTION
@@ -77,11 +76,6 @@ The 'git fmt-merge-msg' command can be
 used to give a good default for automated 'git merge'
 invocations. The automated message can include the branch description.
 
---into-name <branch>::
-	Prepare the default merge message as if merging to the branch
-	`<branch>`, instead of the name of the real branch to which
-	the merge is made.
-
 -F <file>::
 --file=<file>::
 	Read the commit message to be used for the merge commit (in
@@ -246,8 +240,7 @@ from the RCS suite to present such a conflicted hunk, like this:
 
 ------------
 Here are lines that are either unchanged from the common
-ancestor, or cleanly resolved because only one side changed,
-or cleanly resolved because both sides changed the same way.
+ancestor, or cleanly resolved because only one side changed.
 <<<<<<< yours:sample.txt
 Conflict resolution is hard;
 let's go shopping.
@@ -268,37 +261,16 @@ side wants to say it is hard and you'd prefer to go shopping, while the
 other side wants to claim it is easy.
 
 An alternative style can be used by setting the "merge.conflictStyle"
-configuration variable to either "diff3" or "zdiff3".  In "diff3"
-style, the above conflict may look like this:
+configuration variable to "diff3".  In "diff3" style, the above conflict
+may look like this:
 
 ------------
 Here are lines that are either unchanged from the common
-ancestor, or cleanly resolved because only one side changed,
-<<<<<<< yours:sample.txt
-or cleanly resolved because both sides changed the same way.
-Conflict resolution is hard;
-let's go shopping.
-||||||| base:sample.txt
-or cleanly resolved because both sides changed identically.
-Conflict resolution is hard.
-=======
-or cleanly resolved because both sides changed the same way.
-Git makes conflict resolution easy.
->>>>>>> theirs:sample.txt
-And here is another line that is cleanly resolved or unmodified.
-------------
-
-while in "zdiff3" style, it may look like this:
-
-------------
-Here are lines that are either unchanged from the common
-ancestor, or cleanly resolved because only one side changed,
-or cleanly resolved because both sides changed the same way.
+ancestor, or cleanly resolved because only one side changed.
 <<<<<<< yours:sample.txt
 Conflict resolution is hard;
 let's go shopping.
-||||||| base:sample.txt
-or cleanly resolved because both sides changed identically.
+|||||||
 Conflict resolution is hard.
 =======
 Git makes conflict resolution easy.

Documentation/git-mktree.txt

@@ -31,7 +31,7 @@ OPTIONS
 
 --batch::
 	Allow building of more than one tree object before exiting.  Each
-	tree is separated by a single blank line. The final new-line is
+	tree is separated by as single blank line. The final new-line is
 	optional.  Note - if the `-z` option is used, lines are terminated
 	with NUL.
 

Documentation/git-name-rev.txt

@@ -42,37 +42,11 @@ OPTIONS
 --all::
 	List all commits reachable from all refs
 
---annotate-stdin::
+--stdin::
 	Transform stdin by substituting all the 40-character SHA-1
 	hexes (say $hex) with "$hex ($rev_name)".  When used with
 	--name-only, substitute with "$rev_name", omitting $hex
-	altogether.
-+
-For example:
-+
------------
-$ cat sample.txt
-
-An abbreviated revision 2ae0a9cb82 will not be substituted.
-The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907,
-while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
-
-$ git name-rev --annotate-stdin <sample.txt
-
-An abbreviated revision 2ae0a9cb82 will not be substituted.
-The full name after substitution is 2ae0a9cb8298185a94e5998086f380a355dd8907 (master),
-while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
-
-$ git name-rev --name-only --annotate-stdin <sample.txt
-
-An abbreviated revision 2ae0a9cb82 will not be substituted.
-The full name after substitution is master,
-while its tree object is 70d105cc79e63b81cfdcb08a15297c23e60b07ad
------------
-
---stdin::
-	This option is deprecated in favor of 'git name-rev --annotate-stdin'.
-	They are functionally equivalent.
+	altogether.  Intended for the scripter's use.
 
 --name-only::
 	Instead of printing both the SHA-1 and the name, print only

Documentation/git-p4.txt

@@ -9,10 +9,10 @@ git-p4 - Import from and submit to Perforce repositories
 SYNOPSIS
 --------
 [verse]
-'git p4 clone' [<sync-options>] [<clone-options>] <p4-depot-path>...
-'git p4 sync' [<sync-options>] [<p4-depot-path>...]
+'git p4 clone' [<sync options>] [<clone options>] <p4 depot path>...
+'git p4 sync' [<sync options>] [<p4 depot path>...]
 'git p4 rebase'
-'git p4 submit' [<submit-options>] [<master-branch-name>]
+'git p4 submit' [<submit options>] [<master branch name>]
 
 
 DESCRIPTION
@@ -361,7 +361,7 @@ These options can be used to modify 'git p4 submit' behavior.
 	p4/master.  See the "Sync options" section above for more
 	information.
 
---commit (<sha1>|<sha1>..<sha1>)::
+--commit <sha1>|<sha1..sha1>::
     Submit only the specified commit or range of commits, instead of the full
     list of changes that are in the current Git branch.
 

Documentation/git-pack-objects.txt

@@ -13,8 +13,8 @@ SYNOPSIS
 	[--no-reuse-delta] [--delta-base-offset] [--non-empty]
 	[--local] [--incremental] [--window=<n>] [--depth=<n>]
 	[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
-	[--stdout [--filter=<filter-spec>] | <base-name>]
-	[--shallow] [--keep-true-parents] [--[no-]sparse] < <object-list>
+	[--stdout [--filter=<filter-spec>] | base-name]
+	[--shallow] [--keep-true-parents] [--[no-]sparse] < object-list
 
 
 DESCRIPTION

Documentation/git-pack-redundant.txt

@@ -9,7 +9,7 @@ git-pack-redundant - Find redundant pack files
 SYNOPSIS
 --------
 [verse]
-'git pack-redundant' [ --verbose ] [ --alt-odb ] ( --all | <pack-filename>... )
+'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >
 
 DESCRIPTION
 -----------

Documentation/git-read-tree.txt

@@ -375,14 +375,9 @@ have finished your work-in-progress), attempt the merge again.
 SPARSE CHECKOUT
 ---------------
 
-Note: The `update-index` and `read-tree` primitives for supporting the
-skip-worktree bit predated the introduction of
-linkgit:git-sparse-checkout[1].  Users are encouraged to use
-`sparse-checkout` in preference to these low-level primitives.
-
 "Sparse checkout" allows populating the working directory sparsely.
-It uses the skip-worktree bit (see linkgit:git-update-index[1]) to
-tell Git whether a file in the working directory is worth looking at.
+It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
+Git whether a file in the working directory is worth looking at.
 
 'git read-tree' and other merge-based commands ('git merge', 'git
 checkout'...) can help maintaining the skip-worktree bitmap and working
@@ -390,8 +385,7 @@ directory update. `$GIT_DIR/info/sparse-checkout` is used to
 define the skip-worktree reference bitmap. When 'git read-tree' needs
 to update the working directory, it resets the skip-worktree bit in the index
 based on this file, which uses the same syntax as .gitignore files.
-If an entry matches a pattern in this file, or the entry corresponds to
-a file present in the working tree, then skip-worktree will not be
+If an entry matches a pattern in this file, skip-worktree will not be
 set on that entry. Otherwise, skip-worktree will be set.
 
 Then it compares the new skip-worktree value with the previous one. If
@@ -426,8 +420,8 @@ support.
 
 SEE ALSO
 --------
-linkgit:git-write-tree[1], linkgit:git-ls-files[1],
-linkgit:gitignore[5], linkgit:git-sparse-checkout[1]
+linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
+linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];
 
 GIT
 ---

Documentation/git-rebase.txt

@@ -714,9 +714,9 @@ information about the rebased commits and their parents (and instead
 generates new fake commits based off limited information in the
 generated patches), those commits cannot be identified; instead it has
 to fall back to a commit summary.  Also, when merge.conflictStyle is
-set to diff3 or zdiff3, the apply backend will use "constructed merge
-base" to label the content from the merge base, and thus provide no
-information about the merge base commit whatsoever.
+set to diff3, the apply backend will use "constructed merge base" to
+label the content from the merge base, and thus provide no information
+about the merge base commit whatsoever.
 
 The merge backend works with the full commits on both sides of history
 and thus has no such limitations.

Documentation/git-reflog.txt

@@ -17,12 +17,12 @@ The command takes various subcommands, and different options
 depending on the subcommand:
 
 [verse]
-'git reflog' ['show'] [<log-options>] [<ref>]
+'git reflog' ['show'] [log-options] [<ref>]
 'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]
 	[--rewrite] [--updateref] [--stale-fix]
 	[--dry-run | -n] [--verbose] [--all [--single-worktree] | <refs>...]
 'git reflog delete' [--rewrite] [--updateref]
-	[--dry-run | -n] [--verbose] <ref>@\{<specifier>\}...
+	[--dry-run | -n] [--verbose] ref@\{specifier\}...
 'git reflog exists' <ref>
 
 Reference logs, or "reflogs", record when the tips of branches and

Documentation/git-remote.txt

@@ -10,15 +10,15 @@ SYNOPSIS
 --------
 [verse]
 'git remote' [-v | --verbose]
-'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <URL>
-'git remote rename' [--[no-]progress] <old> <new>
+'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
+'git remote rename' <old> <new>
 'git remote remove' <name>
 'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
 'git remote set-branches' [--add] <name> <branch>...
 'git remote get-url' [--push] [--all] <name>
 'git remote set-url' [--push] <name> <newurl> [<oldurl>]
 'git remote set-url --add' [--push] <name> <newurl>
-'git remote set-url --delete' [--push] <name> <URL>
+'git remote set-url --delete' [--push] <name> <url>
 'git remote' [-v | --verbose] 'show' [-n] <name>...
 'git remote prune' [-n | --dry-run] <name>...
 'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]
@@ -47,7 +47,7 @@ subcommands are available to perform operations on the remotes.
 'add'::
 
 Add a remote named <name> for the repository at
-<URL>.  The command `git fetch <name>` can then be used to create and
+<url>.  The command `git fetch <name>` can then be used to create and
 update remote-tracking branches <name>/<branch>.
 +
 With `-f` option, `git fetch <name>` is run immediately after
@@ -152,7 +152,7 @@ With `--push`, push URLs are manipulated instead of fetch URLs.
 With `--add`, instead of changing existing URLs, new URL is added.
 +
 With `--delete`, instead of changing existing URLs, all URLs matching
-regex <URL> are deleted for remote <name>.  Trying to delete all
+regex <url> are deleted for remote <name>.  Trying to delete all
 non-push URLs is an error.
 +
 Note that the push URL and the fetch URL, even though they can

Documentation/git-repack.txt

@@ -76,9 +76,8 @@ to the new separate pack will be written.
 	linkgit:git-pack-objects[1].
 
 -q::
---quiet::
-	Show no progress over the standard error stream and pass the `-q`
-	option to 'git pack-objects'. See linkgit:git-pack-objects[1].
+	Pass the `-q` option to 'git pack-objects'. See
+	linkgit:git-pack-objects[1].
 
 -n::
 	Do not update the server information with

Documentation/git-request-pull.txt

@@ -8,7 +8,7 @@ git-request-pull - Generates a summary of pending changes
 SYNOPSIS
 --------
 [verse]
-'git request-pull' [-p] <start> <URL> [<end>]
+'git request-pull' [-p] <start> <url> [<end>]
 
 DESCRIPTION
 -----------
@@ -21,7 +21,7 @@ the changes and indicates from where they can be pulled.
 The upstream project is expected to have the commit named by
 `<start>` and the output asks it to integrate the changes you made
 since that commit, up to the commit named by `<end>`, by visiting
-the repository named by `<URL>`.
+the repository named by `<url>`.
 
 
 OPTIONS
@@ -33,14 +33,14 @@ OPTIONS
 	Commit to start at.  This names a commit that is already in
 	the upstream history.
 
-<URL>::
+<url>::
 	The repository URL to be pulled from.
 
 <end>::
 	Commit to end at (defaults to HEAD).  This names the commit
 	at the tip of the history you are asking to be pulled.
 +
-When the repository named by `<URL>` has the commit at a tip of a
+When the repository named by `<url>` has the commit at a tip of a
 ref that is different from the ref you have locally, you can use the
 `<local>:<remote>` syntax, to have its local name, a colon `:`, and
 its remote name.

Documentation/git-reset.txt

@@ -105,11 +105,10 @@ OPTIONS
 
 -q::
 --quiet::
-	Be quiet, only report errors.
-
---refresh::
---no-refresh::
-	Refresh the index after a mixed reset. Enabled by default.
+--no-quiet::
+	Be quiet, only report errors. The default behavior is set by the
+	`reset.quiet` config option. `--quiet` and `--no-quiet` will
+	override the default behavior.
 
 --pathspec-from-file=<file>::
 	Pathspec is passed in `<file>` instead of commandline args. If

Documentation/git-restore.txt

@@ -92,7 +92,8 @@ in linkgit:git-checkout[1] for details.
 	The same as `--merge` option above, but changes the way the
 	conflicting hunks are presented, overriding the
 	`merge.conflictStyle` configuration variable.  Possible values
-	are "merge" (default), "diff3", and "zdiff3".
+	are "merge" (default) and "diff3" (in addition to what is
+	shown by "merge" style, shows the original contents).
 
 --ignore-unmerged::
 	When restoring files on the working tree from the index, do

Documentation/git-send-email.txt

@@ -9,8 +9,7 @@ git-send-email - Send a collection of patches as emails
 SYNOPSIS
 --------
 [verse]
-'git send-email' [<options>] <file|directory>...
-'git send-email' [<options>] <format-patch options>
+'git send-email' [<options>] <file|directory|rev-list options>...
 'git send-email' --dump-aliases
 
 
@@ -20,8 +19,7 @@ Takes the patches given on the command line and emails them out.
 Patches can be specified as files, directories (which will send all
 files in the directory), or directly as a revision list.  In the
 last case, any format accepted by linkgit:git-format-patch[1] can
-be passed to git send-email, as well as options understood by
-linkgit:git-format-patch[1].
+be passed to git send-email.
 
 The header of the email is configurable via command-line options.  If not
 specified on the command line, the user will be prompted with a ReadLine

Documentation/git-shortlog.txt

@@ -8,7 +8,7 @@ git-shortlog - Summarize 'git log' output
 SYNOPSIS
 --------
 [verse]
-'git shortlog' [<options>] [<revision-range>] [[--] <path>...]
+'git shortlog' [<options>] [<revision range>] [[--] <path>...]
 git log --pretty=short | 'git shortlog' [<options>]
 
 DESCRIPTION
@@ -89,13 +89,13 @@ counts both authors and co-authors.
 If width is `0` (zero) then indent the lines of the output without wrapping
 them.
 
-<revision-range>::
+<revision range>::
 	Show only commits in the specified revision range.  When no
-	<revision-range> is specified, it defaults to `HEAD` (i.e. the
+	<revision range> is specified, it defaults to `HEAD` (i.e. the
 	whole history leading to the current commit).  `origin..HEAD`
 	specifies all the commits reachable from the current commit
 	(i.e. `HEAD`), but not from `origin`. For a complete list of
-	ways to spell <revision-range>, see the "Specifying Ranges"
+	ways to spell <revision range>, see the "Specifying Ranges"
 	section of linkgit:gitrevisions[7].
 
 [--] <path>...::

Documentation/git-sparse-checkout.txt

@@ -3,32 +3,22 @@ git-sparse-checkout(1)
 
 NAME
 ----
-git-sparse-checkout - Reduce your working tree to a subset of tracked files
+git-sparse-checkout - Initialize and modify the sparse-checkout
+configuration, which reduces the checkout to a set of paths
+given by a list of patterns.
 
 
 SYNOPSIS
 --------
 [verse]
-'git sparse-checkout <subcommand> [<options>]'
+'git sparse-checkout <subcommand> [options]'
 
 
 DESCRIPTION
 -----------
 
-This command is used to create sparse checkouts, which means that it
-changes the working tree from having all tracked files present, to only
-have a subset of them.  It can also switch which subset of files are
-present, or undo and go back to having all tracked files present in the
-working copy.
-
-The subset of files is chosen by providing a list of directories in
-cone mode (which is recommended), or by providing a list of patterns
-in non-cone mode.
-
-When in a sparse-checkout, other Git commands behave a bit differently.
-For example, switching branches will not update paths outside the
-sparse-checkout directories/patterns, and `git commit -a` will not record
-paths outside the sparse-checkout directories/patterns as deleted.
+Initialize and modify the sparse-checkout configuration, which reduces
+the checkout to a set of paths given by a list of patterns.
 
 THIS COMMAND IS EXPERIMENTAL. ITS BEHAVIOR, AND THE BEHAVIOR OF OTHER
 COMMANDS IN THE PRESENCE OF SPARSE-CHECKOUTS, WILL LIKELY CHANGE IN
@@ -38,52 +28,30 @@ THE FUTURE.
 COMMANDS
 --------
 'list'::
-	Describe the directories or patterns in the sparse-checkout file.
+	Describe the patterns in the sparse-checkout file.
 
-'set'::
-	Enable the necessary sparse-checkout config settings
-	(`core.sparseCheckout`, `core.sparseCheckoutCone`, and
-	`index.sparse`) if they are not already set to the desired values,
-	and write a set of patterns to the sparse-checkout file from the
-	list of arguments following the 'set' subcommand. Update the
-	working directory to match the new patterns.
+'init'::
+	Enable the `core.sparseCheckout` setting. If the
+	sparse-checkout file does not exist, then populate it with
+	patterns that match every file in the root directory and
+	no other directories, then will remove all directories tracked
+	by Git. Add patterns to the sparse-checkout file to
+	repopulate the working directory.
 +
-To ensure that adjusting the sparse-checkout settings within a worktree
-does not alter the sparse-checkout settings in other worktrees, the 'set'
-subcommand will upgrade your repository config to use worktree-specific
-config if not already present. The sparsity defined by the arguments to
-the 'set' subcommand are stored in the worktree-specific sparse-checkout
-file. See linkgit:git-worktree[1] and the documentation of
-`extensions.worktreeConfig` in linkgit:git-config[1] for more details.
+To avoid interfering with other worktrees, it first enables the
+`extensions.worktreeConfig` setting and makes sure to set the
+`core.sparseCheckout` setting in the worktree-specific config file.
 +
-When the `--stdin` option is provided, the directories or patterns are
-read from standard in as a newline-delimited list instead of from the
-arguments.
+When `--cone` is provided, the `core.sparseCheckoutCone` setting is
+also set, allowing for better performance with a limited set of
+patterns (see 'CONE PATTERN SET' below).
 +
-When `--cone` is passed or `core.sparseCheckoutCone` is enabled, the
-input list is considered a list of directories.  This allows for
-better performance with a limited set of patterns (see 'CONE PATTERN
-SET' below).  The input format matches the output of `git ls-tree
---name-only`.  This includes interpreting pathnames that begin with a
-double quote (") as C-style quoted strings.  Note that the set command
-will write patterns to the sparse-checkout file to include all files
-contained in those directories (recursively) as well as files that are
-siblings of ancestor directories. This may become the default in the
-future; --no-cone can be passed to request non-cone mode.
-+
-When `--no-cone` is passed or `core.sparseCheckoutCone` is not enabled,
-the input list is considered a list of patterns.  This mode is harder
-to use and less performant, and is thus not recommended.  See the
-"Sparse Checkout" section of linkgit:git-read-tree[1] and the "Pattern
-Set" sections below for more details.
-+
-Use the `--[no-]sparse-index` option to use a sparse index (the
-default is to not use it).  A sparse index reduces the size of the
-index to be more closely aligned with your sparse-checkout
-definition. This can have significant performance advantages for
-commands such as `git status` or `git add`.  This feature is still
-experimental. Some commands might be slower with a sparse index until
-they are properly integrated with the feature.
+Use the `--[no-]sparse-index` option to toggle the use of the sparse
+index format. This reduces the size of the index to be more closely
+aligned with your sparse-checkout definition. This can have significant
+performance advantages for commands such as `git status` or `git add`.
+This feature is still experimental. Some commands might be slower with
+a sparse index until they are properly integrated with the feature.
 +
 **WARNING:** Using a sparse index requires modifying the index in a way
 that is not completely understood by external tools. If you have trouble
@@ -92,11 +60,29 @@ to rewrite your index to not be sparse. Older versions of Git will not
 understand the sparse directory entries index extension and may fail to
 interact with your repository until it is disabled.
 
+'set'::
+	Write a set of patterns to the sparse-checkout file, as given as
+	a list of arguments following the 'set' subcommand. Update the
+	working directory to match the new patterns. Enable the
+	core.sparseCheckout config setting if it is not already enabled.
++
+When the `--stdin` option is provided, the patterns are read from
+standard in as a newline-delimited list instead of from the arguments.
++
+When `core.sparseCheckoutCone` is enabled, the input list is considered a
+list of directories instead of sparse-checkout patterns. The command writes
+patterns to the sparse-checkout file to include all files contained in those
+directories (recursively) as well as files that are siblings of ancestor
+directories. The input format matches the output of `git ls-tree --name-only`.
+This includes interpreting pathnames that begin with a double quote (") as
+C-style quoted strings.
+
 'add'::
-	Update the sparse-checkout file to include additional directories
-	(in cone mode) or patterns (in non-cone mode).  By default, these
-	directories or patterns are read from the command-line arguments,
-	but they can be read from stdin using the `--stdin` option.
+	Update the sparse-checkout file to include additional patterns.
+	By default, these patterns are read from the command-line arguments,
+	but they can be read from stdin using the `--stdin` option. When
+	`core.sparseCheckoutCone` is enabled, the given patterns are interpreted
+	as directory names as in the 'set' subcommand.
 
 'reapply'::
 	Reapply the sparsity pattern rules to paths in the working tree.
@@ -107,47 +93,23 @@ interact with your repository until it is disabled.
 	cases, it can make sense to run `git sparse-checkout reapply` later
 	after cleaning up affected paths (e.g. resolving conflicts, undoing
 	or committing changes, etc.).
-+
-The `reapply` command can also take `--[no-]cone` and `--[no-]sparse-index`
-flags, with the same meaning as the flags from the `set` command, in order
-to change which sparsity mode you are using without needing to also respecify
-all sparsity paths.
 
 'disable'::
 	Disable the `core.sparseCheckout` config setting, and restore the
-	working directory to include all files.
-
-'init'::
-	Deprecated command that behaves like `set` with no specified paths.
-	May be removed in the future.
-+
-Historically, `set` did not handle all the necessary config settings,
-which meant that both `init` and `set` had to be called.  Invoking
-both meant the `init` step would first remove nearly all tracked files
-(and in cone mode, ignored files too), then the `set` step would add
-many of the tracked files (but not ignored files) back.  In addition
-to the lost files, the performance and UI of this combination was
-poor.
-+
-Also, historically, `init` would not actually initialize the
-sparse-checkout file if it already existed.  This meant it was
-possible to return to a sparse-checkout without remembering which
-paths to pass to a subsequent 'set' or 'add' command.  However,
-`--cone` and `--sparse-index` options would not be remembered across
-the disable command, so the easy restore of calling a plain `init`
-decreased in utility.
+	working directory to include all files. Leaves the sparse-checkout
+	file intact so a later 'git sparse-checkout init' command may
+	return the working directory to the same state.
 
 SPARSE CHECKOUT
 ---------------
 
-"Sparse checkout" allows populating the working directory sparsely.  It
-uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git
-whether a file in the working directory is worth looking at. If the
-skip-worktree bit is set, and the file is not present in the working tree,
-then its absence is ignored. Git will avoid populating the contents of
-those files, which makes a sparse checkout helpful when working in a
-repository with many files, but only a few are important to the current
-user.
+"Sparse checkout" allows populating the working directory sparsely.
+It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
+Git whether a file in the working directory is worth looking at. If
+the skip-worktree bit is set, then the file is ignored in the working
+directory. Git will not populate the contents of those files, which
+makes a sparse checkout helpful when working in a repository with many
+files, but only a few are important to the current user.
 
 The `$GIT_DIR/info/sparse-checkout` file is used to define the
 skip-worktree reference bitmap. When Git updates the working
@@ -155,8 +117,10 @@ directory, it updates the skip-worktree bits in the index based
 on this file. The files matching the patterns in the file will
 appear in the working directory, and the rest will not.
 
-To enable the sparse-checkout feature, run `git sparse-checkout set` to
-set the patterns you want to use.
+To enable the sparse-checkout feature, run `git sparse-checkout init` to
+initialize a simple sparse-checkout file and enable the `core.sparseCheckout`
+config setting. Then, run `git sparse-checkout set` to modify the patterns in
+the sparse-checkout file.
 
 To repopulate the working directory with all files, use the
 `git sparse-checkout disable` command.