Autogenerated HTML docs for v2.28.0-450-g3a238

38 files changed, 209 insertions, 90 deletions

diff --git a/RelNotes/2.29.0.txt b/RelNotes/2.29.0.txt
index a020dadab..a640fbc02 100644
--- a/RelNotes/2.29.0.txt
+++ b/RelNotes/2.29.0.txt
@@ -121,6 +121,13 @@ Performance, Internal Implementation, Development Support etc.
    execute the git subcommands, especially built-ins, in "git-foo"
    form, which have been corrected.
 
+ * An unused binary has been discarded, and and a bunch of commands
+   have been turned into into built-in.
+
+ * A handful of places in in-tree code still relied on being able to
+   execute the git subcommands, especially built-ins, in "git-foo"
+   form, which have been corrected.
+
 
 Fixes since v2.28
 -----------------
@@ -263,6 +270,22 @@ Fixes since v2.28
  * Various callers of run_command API has been modernized.
    (merge afbdba391e jc/run-command-use-embedded-args later to maint).
 
+ * List of options offered and accepted by "git add -i/-p" were
+   inconsistent, which have been corrected.
+   (merge ce910287e7 pw/add-p-allowed-options-fix later to maint).
+
+ * Various callers of run_command API has been modernized.
+   (merge afbdba391e jc/run-command-use-embedded-args later to maint).
+
+ * "git diff --stat -w" showed 0-line changes for paths whose changes
+   were only whitespaces, which was not intuitive.  We now omit such
+   paths from the stat output.
+   (merge 1cf3d5db9b mr/diff-hide-stat-wo-textual-change later to maint).
+
+ * It was possible for xrealloc() to send a non-NULL pointer that has
+   been freed, which has been fixed.
+   (merge 6479ea4a8a jk/xrealloc-avoid-use-after-free later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 84544f2ea3 sk/typofixes later to maint).
    (merge b17f411ab5 ar/help-guides-doc later to maint).
@@ -285,3 +308,6 @@ Fixes since v2.28
    (merge 748f733d54 mt/checkout-entry-dead-code-removal later to maint).
    (merge ce820cbd58 dl/subtree-docs later to maint).
    (merge 55fe225dde jk/leakfix later to maint).
+   (merge ee22a29215 so/pretty-abbrev-doc later to maint).
+   (merge 3100fd5588 jc/post-checkout-doc later to maint).
+   (merge 17bae89476 pb/doc-external-diff-env later to maint).
diff --git a/diff-generate-patch.txt b/diff-generate-patch.txt
index e8ed6470f..b10ff4caa 100644
--- a/diff-generate-patch.txt
+++ b/diff-generate-patch.txt
@@ -10,7 +10,8 @@ linkgit:git-diff-tree[1], or
 linkgit:git-diff-files[1]
 with the `-p` option produces patch text.
 You can customize the creation of patch text via the
-`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.
+`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables
+(see linkgit:git[1]).
 
 What the -p option produces is slightly different from the traditional
 diff format:
diff --git a/git-bisect.html b/git-bisect.html
index fdfbbacc7..2c963dc00 100644
--- a/git-bisect.html
+++ b/git-bisect.html
@@ -761,7 +761,7 @@ git-bisect(1) Manual Page
 on the subcommand:</p></div>

 <div class="literalblock">

 <div class="content">

-<pre><code>git bisect start [--term-{old,good}=&lt;term&gt; --term-{new,bad}=&lt;term&gt;]

+<pre><code>git bisect start [--term-{new,bad}=&lt;term&gt; --term-{old,good}=&lt;term&gt;]

                  [--no-checkout] [--first-parent] [&lt;bad&gt; [&lt;good&gt;...]] [--] [&lt;paths&gt;...]

 git bisect (bad|new|&lt;term-new&gt;) [&lt;rev&gt;]

 git bisect (good|old|&lt;term-old&gt;) [&lt;rev&gt;...]

@@ -1240,7 +1240,7 @@ help</code> or <code>git bisect -h</code> to get a long usage description.</p></
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-17 17:32:33 PDT

+ 2020-09-03 13:19:53 PDT

 </div>

 </div>

 </body>

diff --git a/git-bisect.txt b/git-bisect.txt
index 0e993e458..fbb39fbdf 100644
--- a/git-bisect.txt
+++ b/git-bisect.txt
@@ -16,7 +16,7 @@ DESCRIPTION
 The command takes various subcommands, and different options depending
 on the subcommand:
 
- git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
+ git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]
 		  [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]
  git bisect (bad|new|<term-new>) [<rev>]
  git bisect (good|old|<term-old>) [<rev>...]
diff --git a/git-config.html b/git-config.html
index aa99b1aaf..c06723e20 100644
--- a/git-config.html
+++ b/git-config.html
@@ -4740,7 +4740,10 @@ fetch.negotiationAlgorithm
         sent when negotiating the contents of the packfile to be sent by the

         server. Set to "skipping" to use an algorithm that skips commits in an

         effort to converge faster, but may result in a larger-than-necessary

-        packfile; The default is "default" which instructs Git to use the default algorithm

+        packfile; or set to "noop" to not send any information at all, which

+        will almost certainly result in a larger-than-necessary packfile, but

+        will skip the negotiation step.

+        The default is "default" which instructs Git to use the default algorithm

         that never skips commits (unless the server has acknowledged it or one

         of its descendants). If <code>feature.experimental</code> is enabled, then this

         setting defaults to "skipping".

diff --git a/git-diff-files.html b/git-diff-files.html
index 10294da53..de220b332 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -2310,7 +2310,8 @@ all parents.</p></div>
 <a href="git-diff-files.html">git-diff-files(1)</a>

 with the <code>-p</code> option produces patch text.

 You can customize the creation of patch text via the

-<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>

+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables

+(see <a href="git.html">git(1)</a>).</p></div>

 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional

 diff format:</p></div>

 <div class="olist arabic"><ol class="arabic">

diff --git a/git-diff-index.html b/git-diff-index.html
index 117ff9f43..9f8d854fa 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -2294,7 +2294,8 @@ all parents.</p></div>
 <a href="git-diff-files.html">git-diff-files(1)</a>

 with the <code>-p</code> option produces patch text.

 You can customize the creation of patch text via the

-<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>

+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables

+(see <a href="git.html">git(1)</a>).</p></div>

 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional

 diff format:</p></div>

 <div class="olist arabic"><ol class="arabic">

diff --git a/git-diff-tree.html b/git-diff-tree.html
index c93e7223d..8d7f6b89b 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -2138,8 +2138,8 @@ people using 80-column terminals.</p></div>
 <dd>

 <p>

         Show the full 40-byte hexadecimal commit object name. This negates

-        <code>--abbrev-commit</code> and those options which imply it such as

-        "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

+        <code>--abbrev-commit</code>, either explicit or implied by other options such

+        as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -3497,7 +3497,8 @@ all parents.</p></div>
 <a href="git-diff-files.html">git-diff-files(1)</a>

 with the <code>-p</code> option produces patch text.

 You can customize the creation of patch text via the

-<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>

+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables

+(see <a href="git.html">git(1)</a>).</p></div>

 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional

 diff format:</p></div>

 <div class="olist arabic"><ol class="arabic">

diff --git a/git-diff.html b/git-diff.html
index a37f569ed..261932ed4 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -2433,7 +2433,8 @@ all parents.</p></div>
 <a href="git-diff-files.html">git-diff-files(1)</a>

 with the <code>-p</code> option produces patch text.

 You can customize the creation of patch text via the

-<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>

+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables

+(see <a href="git.html">git(1)</a>).</p></div>

 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional

 diff format:</p></div>

 <div class="olist arabic"><ol class="arabic">

diff --git a/git-fetch.html b/git-fetch.html
index ea556bd28..a8f1369a1 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -1336,6 +1336,15 @@ must know this is the expected usage pattern for a branch.</td>
 </tr></table>

 </div>

 </dd>

+<dt class="hdlist1">

+--stdin

+</dt>

+<dd>

+<p>

+        Read refspecs, one per line, from stdin in addition to those provided

+        as arguments. The "tag &lt;name&gt;" format is not supported.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1941,7 +1950,7 @@ version.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-06 22:33:22 PDT

+ 2020-09-03 13:19:53 PDT

 </div>

 </div>

 </body>

diff --git a/git-fetch.txt b/git-fetch.txt
index 45b6d8e63..9067c2079 100644
--- a/git-fetch.txt
+++ b/git-fetch.txt
@@ -48,6 +48,10 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
+--stdin::
+	Read refspecs, one per line, from stdin in addition to those provided
+	as arguments. The "tag <name>" format is not supported.
+
 include::urls-remotes.txt[]
 
 
diff --git a/git-log.html b/git-log.html
index 938ee40d4..f73be1192 100644
--- a/git-log.html
+++ b/git-log.html
@@ -2120,8 +2120,8 @@ people using 80-column terminals.</p></div>
 <dd>

 <p>

         Show the full 40-byte hexadecimal commit object name. This negates

-        <code>--abbrev-commit</code> and those options which imply it such as

-        "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

+        <code>--abbrev-commit</code>, either explicit or implied by other options such

+        as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -4643,7 +4643,8 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 <a href="git-diff-files.html">git-diff-files(1)</a>

 with the <code>-p</code> option produces patch text.

 You can customize the creation of patch text via the

-<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>

+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables

+(see <a href="git.html">git(1)</a>).</p></div>

 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional

 diff format:</p></div>

 <div class="olist arabic"><ol class="arabic">

diff --git a/git-rebase.html b/git-rebase.html
index 77d871014..8c3b2dc87 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1045,6 +1045,17 @@ rebase.rescheduleFailedExec
         This is the same as specifying the <code>--reschedule-failed-exec</code> option.

 </p>

 </dd>

+<dt class="hdlist1">

+sequence.editor

+</dt>

+<dd>

+<p>

+        Text editor used by <code>git rebase -i</code> for editing the rebase instruction file.

+        The value is meant to be interpreted by the shell when it is used.

+        It can be overridden by the <code>GIT_SEQUENCE_EDITOR</code> environment variable.

+        When not configured the default commit message editor is used instead.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1454,12 +1465,28 @@ with <code>--keep-base</code> in order to drop those commits from your branch.</
 <dt class="hdlist1">

 --ignore-whitespace

 </dt>

+<dd>

+<p>

+        Ignore whitespace differences when trying to reconcile

+differences. Currently, each backend implements an approximation of

+this behavior:

+</p>

+<div class="paragraph"><p>apply backend: When applying a patch, ignore changes in whitespace in

+context lines. Unfortunately, this means that if the "old" lines being

+replaced by the patch differ only in whitespace from the existing

+file, you will get a merge conflict instead of a successful patch

+application.</p></div>

+<div class="paragraph"><p>merge backend: Treat lines with only whitespace changes as unchanged

+when merging. Unfortunately, this means that any patch hunks that were

+intended to modify whitespace and nothing else will be dropped, even

+if the other side had no changes that conflicted.</p></div>

+</dd>

 <dt class="hdlist1">

 --whitespace=&lt;option&gt;

 </dt>

 <dd>

 <p>

-        These flags are passed to the <em>git apply</em> program

+        This flag is passed to the <em>git apply</em> program

         (see <a href="git-apply.html">git-apply(1)</a>) that applies the patch.

         Implies --apply.

 </p>

@@ -1468,13 +1495,24 @@ with <code>--keep-base</code> in order to drop those commits from your branch.</
 <dt class="hdlist1">

 --committer-date-is-author-date

 </dt>

+<dd>

+<p>

+        Instead of using the current time as the committer date, use

+        the author date of the commit being rebased as the committer

+        date. This option implies <code>--force-rebase</code>.

+</p>

+</dd>

 <dt class="hdlist1">

 --ignore-date

 </dt>

+<dt class="hdlist1">

+--reset-author-date

+</dt>

 <dd>

 <p>

-        These flags are passed to <em>git am</em> to easily change the dates

-        of the rebased commits (see <a href="git-am.html">git-am(1)</a>).

+        Instead of using the author date of the original commit, use

+        the current time as the author date of the rebased commit.  This

+        option implies <code>--force-rebase</code>.

 </p>

 <div class="paragraph"><p>See also INCOMPATIBLE OPTIONS below.</p></div>

 </dd>

@@ -1667,21 +1705,6 @@ used to override and disable this setting.</p></div>
 </li>

 <li>

 <p>

---committer-date-is-author-date

-</p>

-</li>

-<li>

-<p>

---ignore-date

-</p>

-</li>

-<li>

-<p>

---ignore-whitespace

-</p>

-</li>

-<li>

-<p>

 --whitespace

 </p>

 </li>

@@ -1788,6 +1811,21 @@ used to override and disable this setting.</p></div>
 </li>

 <li>

 <p>

+--preserve-merges and --ignore-whitespace

+</p>

+</li>

+<li>

+<p>

+--preserve-merges and --committer-date-is-author-date

+</p>

+</li>

+<li>

+<p>

+--preserve-merges and --ignore-date

+</p>

+</li>

+<li>

+<p>

 --keep-base and --onto

 </p>

 </li>

@@ -2716,7 +2754,7 @@ Use <code>--rebase-merges</code> in such scenarios instead.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-09 14:26:04 PDT

+ 2020-09-03 13:19:53 PDT

 </div>

 </div>

 </body>

diff --git a/git-rebase.txt b/git-rebase.txt
index 374d2486f..38e15488f 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -204,6 +204,7 @@ CONFIGURATION
 -------------
 
 include::config/rebase.txt[]
+include::config/sequencer.txt[]
 
 OPTIONS
 -------
@@ -459,17 +460,38 @@ with `--keep-base` in order to drop those commits from your branch.
 See also INCOMPATIBLE OPTIONS below.
 
 --ignore-whitespace::
+	Ignore whitespace differences when trying to reconcile
+differences. Currently, each backend implements an approximation of
+this behavior:
++
+apply backend: When applying a patch, ignore changes in whitespace in
+context lines. Unfortunately, this means that if the "old" lines being
+replaced by the patch differ only in whitespace from the existing
+file, you will get a merge conflict instead of a successful patch
+application.
++
+merge backend: Treat lines with only whitespace changes as unchanged
+when merging. Unfortunately, this means that any patch hunks that were
+intended to modify whitespace and nothing else will be dropped, even
+if the other side had no changes that conflicted.
+
 --whitespace=<option>::
-	These flags are passed to the 'git apply' program
+	This flag is passed to the 'git apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
 	Implies --apply.
 +
 See also INCOMPATIBLE OPTIONS below.
 
 --committer-date-is-author-date::
+	Instead of using the current time as the committer date, use
+	the author date of the commit being rebased as the committer
+	date. This option implies `--force-rebase`.
+
 --ignore-date::
-	These flags are passed to 'git am' to easily change the dates
-	of the rebased commits (see linkgit:git-am[1]).
+--reset-author-date::
+	Instead of using the author date of the original commit, use
+	the current time as the	author date of the rebased commit.  This
+	option implies `--force-rebase`.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -607,9 +629,6 @@ INCOMPATIBLE OPTIONS
 The following options:
 
  * --apply
- * --committer-date-is-author-date
- * --ignore-date
- * --ignore-whitespace
  * --whitespace
  * -C
 
@@ -636,6 +655,9 @@ In addition, the following pairs of options are incompatible:
  * --preserve-merges and --signoff
  * --preserve-merges and --rebase-merges
  * --preserve-merges and --empty=
+ * --preserve-merges and --ignore-whitespace
+ * --preserve-merges and --committer-date-is-author-date
+ * --preserve-merges and --ignore-date
  * --keep-base and --onto
  * --keep-base and --root
  * --fork-point and --root
diff --git a/git-rev-list.html b/git-rev-list.html
index 4ccb22160..2758311e4 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -2220,8 +2220,8 @@ people using 80-column terminals.</p></div>
 <dd>

 <p>

         Show the full 40-byte hexadecimal commit object name. This negates

-        <code>--abbrev-commit</code> and those options which imply it such as

-        "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

+        <code>--abbrev-commit</code>, either explicit or implied by other options such

+        as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

 </p>

 </dd>

 <dt class="hdlist1">

diff --git a/git-show.html b/git-show.html
index c4d60276e..ea1256d92 100644
--- a/git-show.html
+++ b/git-show.html
@@ -823,8 +823,8 @@ people using 80-column terminals.</p></div>
 <dd>

 <p>

         Show the full 40-byte hexadecimal commit object name. This negates

-        <code>--abbrev-commit</code> and those options which imply it such as

-        "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

+        <code>--abbrev-commit</code>, either explicit or implied by other options such

+        as "--oneline". It also overrides the <code>log.abbrevCommit</code> variable.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -3109,7 +3109,8 @@ matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<
 <a href="git-diff-files.html">git-diff-files(1)</a>

 with the <code>-p</code> option produces patch text.

 You can customize the creation of patch text via the

-<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables.</p></div>

+<code>GIT_EXTERNAL_DIFF</code> and the <code>GIT_DIFF_OPTS</code> environment variables

+(see <a href="git.html">git(1)</a>).</p></div>

 <div class="paragraph"><p>What the -p option produces is slightly different from the traditional

 diff format:</p></div>

 <div class="olist arabic"><ol class="arabic">

diff --git a/git.html b/git.html
index 2dbe12894..9105fa432 100644
--- a/git.html
+++ b/git.html
@@ -2899,8 +2899,9 @@ double-quotes and respecting backslash escapes. E.g., the value
 <dd>

 <p>

         When the environment variable <code>GIT_EXTERNAL_DIFF</code> is set, the

-        program named by it is called, instead of the diff invocation

-        described above.  For a path that is added, removed, or modified,

+        program named by it is called to generate diffs, and Git

+        does not use its builtin diff machinery.

+        For a path that is added, removed, or modified,

         <code>GIT_EXTERNAL_DIFF</code> is called with 7 parameters:

 </p>

 <div class="literalblock">

@@ -3006,6 +3007,17 @@ parameter, &lt;path&gt;.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+<code>GIT_SEQUENCE_EDITOR</code>

+</dt>

+<dd>

+<p>

+        This environment variable overrides the configured Git editor

+        when editing the todo list of an interactive rebase. See also

+        linkit::git-rebase[1] and the <code>sequence.editor</code> option in

+        linkit::git-config[1].

+</p>

+</dd>

+<dt class="hdlist1">

 <code>GIT_SSH</code>

 </dt>

 <dt class="hdlist1">

@@ -3551,7 +3563,7 @@ the Git Security mailing list &lt;<a href="mailto:git-security@googlegroups.com"
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-24 15:54:20 PDT

+ 2020-09-03 13:19:53 PDT

 </div>

 </div>

 </body>

diff --git a/git.txt b/git.txt
index 2fc92586b..2f72b1022 100644
--- a/git.txt
+++ b/git.txt
@@ -551,8 +551,9 @@ Git Diffs
 
 `GIT_EXTERNAL_DIFF`::
 	When the environment variable `GIT_EXTERNAL_DIFF` is set, the
-	program named by it is called, instead of the diff invocation
-	described above.  For a path that is added, removed, or modified,
+	program named by it is called to generate diffs, and Git
+	does not use its builtin diff machinery.
+	For a path that is added, removed, or modified,
 	`GIT_EXTERNAL_DIFF` is called with 7 parameters:
 
 	path old-file old-hex old-mode new-file new-hex new-mode
@@ -605,6 +606,12 @@ other
 	an editor is to be launched. See also linkgit:git-var[1]
 	and the `core.editor` option in linkgit:git-config[1].
 
+`GIT_SEQUENCE_EDITOR`::
+	This environment variable overrides the configured Git editor
+	when editing the todo list of an interactive rebase. See also
+	linkit::git-rebase[1] and the `sequence.editor` option in
+	linkit::git-config[1].
+
 `GIT_SSH`::
 `GIT_SSH_COMMAND`::
 	If either of these environment variables is set then 'git fetch'
diff --git a/githooks.html b/githooks.html
index f6c1a9756..29c5b03bd 100644
--- a/githooks.html
+++ b/githooks.html
@@ -901,7 +901,9 @@ worktree.  The hook is given three parameters: the ref of the previous HEAD,
 the ref of the new HEAD (which may or may not have changed), and a flag

 indicating whether the checkout was a branch checkout (changing branches,

 flag=1) or a file checkout (retrieving a file from the index, flag=0).

-This hook cannot affect the outcome of <code>git switch</code> or <code>git checkout</code>.</p></div>

+This hook cannot affect the outcome of <code>git switch</code> or <code>git checkout</code>,

+other than that the hook&#8217;s exit status becomes the exit status of

+these two commands.</p></div>

 <div class="paragraph"><p>It is also run after <a href="git-clone.html">git-clone(1)</a>, unless the <code>--no-checkout</code> (<code>-n</code>) option is

 used. The first parameter given to the hook is the null-ref, the second the

 ref of the new HEAD and the flag is always 1. Likewise for <code>git worktree add</code>

@@ -1304,7 +1306,7 @@ running passing "1", "1" should not be possible.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-07-24 16:13:27 PDT

+ 2020-09-03 13:19:53 PDT

 </div>

 </div>

 </body>

diff --git a/githooks.txt b/githooks.txt
index 31b601e4b..cf95d6d02 100644
--- a/githooks.txt
+++ b/githooks.txt
@@ -193,7 +193,9 @@ worktree.  The hook is given three parameters: the ref of the previous HEAD,
 the ref of the new HEAD (which may or may not have changed), and a flag
 indicating whether the checkout was a branch checkout (changing branches,
 flag=1) or a file checkout (retrieving a file from the index, flag=0).
-This hook cannot affect the outcome of `git switch` or `git checkout`.
+This hook cannot affect the outcome of `git switch` or `git checkout`,
+other than that the hook's exit status becomes the exit status of
+these two commands.
 
 It is also run after linkgit:git-clone[1], unless the `--no-checkout` (`-n`) option is
 used. The first parameter given to the hook is the null-ref, the second the
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 68b7f8462..1ac30bbe1 100644
--- a/howto/keep-canonical-history-correct.html
+++ b/howto/keep-canonical-history-correct.html
@@ -938,7 +938,7 @@ tip of your <em>master</em> again and redo the two merges:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:36 PDT

+ 2020-09-03 13:20:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index a49bbec46..53b09ef19 100644
--- a/howto/maintain-git.html
+++ b/howto/maintain-git.html
@@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:36 PDT

+ 2020-09-03 13:20:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index bc2213eee..cbb0568bd 100644
--- a/howto/new-command.html
+++ b/howto/new-command.html
@@ -863,7 +863,7 @@ letter [PATCH 0/n].
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:30 PDT

+ 2020-09-03 13:20:40 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 2fe7fbb79..3c825b00d 100644
--- a/howto/rebase-from-internal-branch.html
+++ b/howto/rebase-from-internal-branch.html
@@ -895,7 +895,7 @@ the #1' commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:36 PDT

+ 2020-09-03 13:20:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 502fa154c..e60bea700 100644
--- a/howto/rebuild-from-update-hook.html
+++ b/howto/rebuild-from-update-hook.html
@@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:35 PDT

+ 2020-09-03 13:20:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 9af86932e..7356122f3 100644
--- a/howto/recover-corrupted-blob-object.html
+++ b/howto/recover-corrupted-blob-object.html
@@ -880,7 +880,7 @@ thing.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:34 PDT

+ 2020-09-03 13:20:42 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index e913fc3eb..af8d7aa8f 100644
--- a/howto/recover-corrupted-object-harder.html
+++ b/howto/recover-corrupted-object-harder.html
@@ -1189,7 +1189,7 @@ int main(int argc, char **argv)
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:35 PDT

+ 2020-09-03 13:20:43 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 81efa3d48..db79bb5a6 100644
--- a/howto/revert-a-faulty-merge.html
+++ b/howto/revert-a-faulty-merge.html
@@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:33 PDT

+ 2020-09-03 13:20:42 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 141d68496..725287a17 100644
--- a/howto/revert-branch-rebase.html
+++ b/howto/revert-branch-rebase.html
@@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:30 PDT

+ 2020-09-03 13:20:40 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index ee671a61a..a6ee27f32 100644
--- a/howto/separating-topic-branches.html
+++ b/howto/separating-topic-branches.html
@@ -841,7 +841,7 @@ o---o"master"</code></pre>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:33 PDT

+ 2020-09-03 13:20:42 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index eac3af9d2..928d2d5aa 100644
--- a/howto/setup-git-server-over-http.html
+++ b/howto/setup-git-server-over-http.html
@@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:32 PDT

+ 2020-09-03 13:20:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 8c4a4eb04..d0dea8657 100644
--- a/howto/update-hook-example.html
+++ b/howto/update-hook-example.html
@@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:32 PDT

+ 2020-09-03 13:20:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index f27a58267..9e24daaae 100644
--- a/howto/use-git-daemon.html
+++ b/howto/use-git-daemon.html
@@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:31 PDT

+ 2020-09-03 13:20:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index d4396af55..270973123 100644
--- a/howto/using-merge-subtree.html
+++ b/howto/using-merge-subtree.html
@@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:31 PDT

+ 2020-09-03 13:20:40 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index ef9ced193..3c89e6cfd 100644
--- a/howto/using-signed-tag-in-pull-request.html
+++ b/howto/using-signed-tag-in-pull-request.html
@@ -952,7 +952,7 @@ as part of the merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-08-31 16:13:31 PDT

+ 2020-09-03 13:20:40 PDT

 </div>

 </div>

 </body>

diff --git a/pretty-options.txt b/pretty-options.txt
index 7a6da6db7..17c5aac4b 100644
--- a/pretty-options.txt
+++ b/pretty-options.txt
@@ -25,8 +25,8 @@ people using 80-column terminals.
 
 --no-abbrev-commit::
 	Show the full 40-byte hexadecimal commit object name. This negates
-	`--abbrev-commit` and those options which imply it such as
-	"--oneline". It also overrides the `log.abbrevCommit` variable.
+	`--abbrev-commit`, either explicit or implied by other options such
+	as "--oneline". It also overrides the `log.abbrevCommit` variable.
 
 --oneline::
 	This is a shorthand for "--pretty=oneline --abbrev-commit"
diff --git a/technical/partial-clone.html b/technical/partial-clone.html
index 6b53e0d0c..2010eaa36 100644
--- a/technical/partial-clone.html
+++ b/technical/partial-clone.html
@@ -963,25 +963,19 @@ additional flag.</p></div>
 <div class="ulist"><ul>

 <li>

 <p>

-Fetching of objects is done using the existing transport mechanism using

-  transport_fetch_refs(), setting a new transport option

-  TRANS_OPT_NO_DEPENDENTS to indicate that only the objects themselves are

-  desired, not any object that they refer to.

+Fetching of objects is done by invoking a "git fetch" subprocess.

 </p>

-<div class="paragraph"><p>Because some transports invoke fetch_pack() in the same process, fetch_pack()

-has been updated to not use any object flags when the corresponding argument

-(no_dependents) is set.</p></div>

 </li>

 <li>

 <p>

 The local repository sends a request with the hashes of all requested

-  objects as "want" lines, and does not perform any packfile negotiation.

+  objects, and does not perform any packfile negotiation.

   It then receives a packfile.

 </p>

 </li>

 <li>

 <p>

-Because we are reusing the existing fetch-pack mechanism, fetching

+Because we are reusing the existing fetch mechanism, fetching

   currently fetches all objects referred to by the requested objects, even

   though they are not necessary.

 </p>

@@ -1219,7 +1213,7 @@ type of packfile that references it.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-03-10 08:03:13 PDT

+ 2020-09-03 13:19:53 PDT

 </div>

 </div>

 </body>

diff --git a/technical/partial-clone.txt b/technical/partial-clone.txt
index b9e17e7a2..0780d30ca 100644
--- a/technical/partial-clone.txt
+++ b/technical/partial-clone.txt
@@ -171,20 +171,13 @@ additional flag.
 Fetching Missing Objects
 ------------------------
 
-- Fetching of objects is done using the existing transport mechanism using
-  transport_fetch_refs(), setting a new transport option
-  TRANS_OPT_NO_DEPENDENTS to indicate that only the objects themselves are
-  desired, not any object that they refer to.
-+
-Because some transports invoke fetch_pack() in the same process, fetch_pack()
-has been updated to not use any object flags when the corresponding argument
-(no_dependents) is set.
+- Fetching of objects is done by invoking a "git fetch" subprocess.
 
 - The local repository sends a request with the hashes of all requested
-  objects as "want" lines, and does not perform any packfile negotiation.
+  objects, and does not perform any packfile negotiation.
   It then receives a packfile.
 
-- Because we are reusing the existing fetch-pack mechanism, fetching
+- Because we are reusing the existing fetch mechanism, fetching
   currently fetches all objects referred to by the requested objects, even
   though they are not necessary.