Autogenerated HTML docs for v2.33.0-721-g10629

27 files changed, 108 insertions, 55 deletions

diff --git a/MyFirstContribution.html b/MyFirstContribution.html
index ce593ad98..ee162ab25 100644
--- a/MyFirstContribution.html
+++ b/MyFirstContribution.html
@@ -1724,19 +1724,37 @@ kidding - be patient!)</p></div>
 </div>

 <div class="sect2">

 <h3 id="v2-git-send-email">Sending v2</h3>

-<div class="paragraph"><p>Skip ahead to <a href="#reviewing">Responding to Reviews</a> for information on how to

-handle comments from reviewers. Continue this section when your topic branch is

-shaped the way you want it to look for your patchset v2.</p></div>

-<div class="paragraph"><p>When you&#8217;re ready with the next iteration of your patch, the process is fairly

-similar.</p></div>

-<div class="paragraph"><p>First, generate your v2 patches again:</p></div>

+<div class="paragraph"><p>This section will focus on how to send a v2 of your patchset. To learn what

+should go into v2, skip ahead to <a href="#reviewing">Responding to Reviews</a> for

+information on how to handle comments from reviewers.</p></div>

+<div class="paragraph"><p>We&#8217;ll reuse our <code>psuh</code> topic branch for v2. Before we make any changes, we&#8217;ll

+mark the tip of our v1 branch for easy reference:</p></div>

+<div class="listingblock">

+<div class="content">

+<pre><code>$ git checkout psuh

+$ git branch psuh-v1</code></pre>

+</div></div>

+<div class="paragraph"><p>Refine your patch series by using <code>git rebase -i</code> to adjust commits based upon

+reviewer comments. Once the patch series is ready for submission, generate your

+patches again, but with some new flags:</p></div>

 <div class="listingblock">

 <div class="content">

-<pre><code>$ git format-patch -v2 --cover-letter -o psuh/ master..psuh</code></pre>

+<pre><code>$ git format-patch -v2 --cover-letter -o psuh/ --range-diff master..psuh-v1 master..</code></pre>

 </div></div>

-<div class="paragraph"><p>This will add your v2 patches, all named like <code>v2-000n-my-commit-subject.patch</code>,

-to the <code>psuh/</code> directory. You may notice that they are sitting alongside the v1

-patches; that&#8217;s fine, but be careful when you are ready to send them.</p></div>

+<div class="paragraph"><p>The <code>--range-diff master..psuh-v1</code> parameter tells <code>format-patch</code> to include a

+range-diff between <code>psuh-v1</code> and <code>psuh</code> in the cover letter (see

+<a href="git-range-diff.html">git-range-diff(1)</a>). This helps tell reviewers about the differences

+between your v1 and v2 patches.</p></div>

+<div class="paragraph"><p>The <code>-v2</code> parameter tells <code>format-patch</code> to output your patches

+as version "2". For instance, you may notice that your v2 patches are

+all named like <code>v2-000n-my-commit-subject.patch</code>. <code>-v2</code> will also format

+your patches by prefixing them with "[PATCH v2]" instead of "[PATCH]",

+and your range-diff will be prefaced with "Range-diff against v1".</p></div>

+<div class="paragraph"><p>Afer you run this command, <code>format-patch</code> will output the patches to the <code>psuh/</code>

+directory, alongside the v1 patches. Using a single directory makes it easy to

+refer to the old v1 patches while proofreading the v2 patches, but you will need

+to be careful to send out only the v2 patches. We will use a pattern like

+"psuh/v2-<strong>.patch" (not "psuh/</strong>.patch", which would match v1 and v2 patches).</p></div>

 <div class="paragraph"><p>Edit your cover letter again. Now is a good time to mention what&#8217;s different

 between your last version and now, if it&#8217;s something significant. You do not

 need the exact same body in your second cover letter; focus on explaining to

@@ -1769,7 +1787,7 @@ to the command:</p></div>
 <div class="content">

 <pre><code>$ git send-email --to=target@example.com

                  --in-reply-to="&lt;foo.12345.author@example.com&gt;"

-                 psuh/v2*</code></pre>

+                 psuh/v2-*.patch</code></pre>

 </div></div>

 </div>

 <div class="sect2">

@@ -1912,7 +1930,7 @@ should generate your diffs from <code>&lt;topic&gt;..&lt;mybranch&gt;</code> and
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-07-14 15:10:10 PDT

+ 2021-10-06 14:16:38 PDT

 </div>

 </div>

 </body>

diff --git a/MyFirstContribution.txt b/MyFirstContribution.txt
index 015cf2463..b20bc8e91 100644
--- a/MyFirstContribution.txt
+++ b/MyFirstContribution.txt
@@ -1029,22 +1029,42 @@ kidding - be patient!)
 [[v2-git-send-email]]
 === Sending v2
 
-Skip ahead to <<reviewing,Responding to Reviews>> for information on how to
-handle comments from reviewers. Continue this section when your topic branch is
-shaped the way you want it to look for your patchset v2.
+This section will focus on how to send a v2 of your patchset. To learn what
+should go into v2, skip ahead to <<reviewing,Responding to Reviews>> for
+information on how to handle comments from reviewers.
+
+We'll reuse our `psuh` topic branch for v2. Before we make any changes, we'll
+mark the tip of our v1 branch for easy reference:
 
-When you're ready with the next iteration of your patch, the process is fairly
-similar.
+----
+$ git checkout psuh
+$ git branch psuh-v1
+----
 
-First, generate your v2 patches again:
+Refine your patch series by using `git rebase -i` to adjust commits based upon
+reviewer comments. Once the patch series is ready for submission, generate your
+patches again, but with some new flags:
 
 ----
-$ git format-patch -v2 --cover-letter -o psuh/ master..psuh
+$ git format-patch -v2 --cover-letter -o psuh/ --range-diff master..psuh-v1 master..
 ----
 
-This will add your v2 patches, all named like `v2-000n-my-commit-subject.patch`,
-to the `psuh/` directory. You may notice that they are sitting alongside the v1
-patches; that's fine, but be careful when you are ready to send them.
+The `--range-diff master..psuh-v1` parameter tells `format-patch` to include a
+range-diff between `psuh-v1` and `psuh` in the cover letter (see
+linkgit:git-range-diff[1]). This helps tell reviewers about the differences
+between your v1 and v2 patches.
+
+The `-v2` parameter tells `format-patch` to output your patches
+as version "2". For instance, you may notice that your v2 patches are
+all named like `v2-000n-my-commit-subject.patch`. `-v2` will also format
+your patches by prefixing them with "[PATCH v2]" instead of "[PATCH]",
+and your range-diff will be prefaced with "Range-diff against v1".
+
+Afer you run this command, `format-patch` will output the patches to the `psuh/`
+directory, alongside the v1 patches. Using a single directory makes it easy to
+refer to the old v1 patches while proofreading the v2 patches, but you will need
+to be careful to send out only the v2 patches. We will use a pattern like
+"psuh/v2-*.patch" (not "psuh/*.patch", which would match v1 and v2 patches).
 
 Edit your cover letter again. Now is a good time to mention what's different
 between your last version and now, if it's something significant. You do not
@@ -1082,7 +1102,7 @@ to the command:
 ----
 $ git send-email --to=target@example.com
 		 --in-reply-to="<foo.12345.author@example.com>"
-		 psuh/v2*
+		 psuh/v2-*.patch
 ----
 
 [[single-patch]]
diff --git a/RelNotes/2.34.0.txt b/RelNotes/2.34.0.txt
index 7b03e625d..9d583ead0 100644
--- a/RelNotes/2.34.0.txt
+++ b/RelNotes/2.34.0.txt
@@ -59,6 +59,9 @@ UI, Workflows & Features
  * The unicode character width table (used for output alignment) has
    been updated.
 
+ * The ref iteration code used to optionally allow dangling refs to be
+   shown, which has been tightened up.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -133,6 +136,11 @@ Performance, Internal Implementation, Development Support etc.
  * An oddball OPTION_ARGUMENT feature has been removed from the
    parse-options API.
 
+ * The mergesort implementation used to sort linked list has been
+   optimized.
+
+ * Remove external declaration of functions that no longer exist.
+
 
 Fixes since v2.33
 -----------------
@@ -342,3 +350,4 @@ Fixes since v2.33
    (merge 8c6b4332b4 rs/close-pack-leakfix later to maint).
    (merge 51b04c05b7 bs/difftool-msg-tweak later to maint).
    (merge dd20e4a6db ab/make-compdb-fix later to maint).
+   (merge 6ffb990dc4 os/status-docfix later to maint).
diff --git a/git-multi-pack-index.html b/git-multi-pack-index.html
index 0fa3260c8..390c34d1d 100644
--- a/git-multi-pack-index.html
+++ b/git-multi-pack-index.html
@@ -749,8 +749,7 @@ git-multi-pack-index(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<pre class="content"><em>git multi-pack-index</em> [--object-dir=&lt;dir&gt;] [--[no-]progress]

-        [--preferred-pack=&lt;pack&gt;] [--[no-]bitmap] &lt;subcommand&gt;</pre>

+<pre class="content"><em>git multi-pack-index</em> [--object-dir=&lt;dir&gt;] [--[no-]bitmap] &lt;sub-command&gt;</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -782,7 +781,8 @@ git-multi-pack-index(1) Manual Page
 <dd>

 <p>

         Turn progress on/off explicitly. If neither is specified, progress is

-        shown if standard error is connected to a terminal.

+        shown if standard error is connected to a terminal. Supported by

+        sub-commands <code>write</code>, <code>verify</code>, <code>expire</code>, and `repack.

 </p>

 </dd>

 </dl></div>

@@ -930,7 +930,7 @@ Format</a> for more information on the multi-pack-index feature.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-09-20 15:44:03 PDT

+ 2021-10-06 14:16:38 PDT

 </div>

 </div>

 </body>

diff --git a/git-multi-pack-index.txt b/git-multi-pack-index.txt
index a9df3dbd3..3b0b55cd7 100644
--- a/git-multi-pack-index.txt
+++ b/git-multi-pack-index.txt
@@ -9,8 +9,7 @@ git-multi-pack-index - Write and verify multi-pack-indexes
 SYNOPSIS
 --------
 [verse]
-'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress]
-	[--preferred-pack=<pack>] [--[no-]bitmap] <subcommand>
+'git multi-pack-index' [--object-dir=<dir>] [--[no-]bitmap] <sub-command>
 
 DESCRIPTION
 -----------
@@ -28,7 +27,8 @@ OPTIONS
 
 --[no-]progress::
 	Turn progress on/off explicitly. If neither is specified, progress is
-	shown if standard error is connected to a terminal.
+	shown if standard error is connected to a terminal. Supported by
+	sub-commands `write`, `verify`, `expire`, and `repack.
 
 The following subcommands are available:
 
diff --git a/git-rebase.html b/git-rebase.html
index 0bd5a7928..328f0eef5 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1325,7 +1325,8 @@ details).</p></div>
 &lt;branch&gt;</code> command (see <a href="git-merge-base.html">git-merge-base(1)</a>).  If <em>fork_point</em>

 ends up being empty, the &lt;upstream&gt; will be used as a fallback.</p></div>

 <div class="paragraph"><p>If &lt;upstream&gt; is given on the command line, then the default is

-<code>--no-fork-point</code>, otherwise the default is <code>--fork-point</code>.</p></div>

+<code>--no-fork-point</code>, otherwise the default is <code>--fork-point</code>. See also

+<code>rebase.forkpoint</code> in <a href="git-config.html">git-config(1)</a>.</p></div>

 <div class="paragraph"><p>If your branch was based on &lt;upstream&gt; but &lt;upstream&gt; was rewound and

 your branch contains commits which were dropped, this option can be used

 with <code>--keep-base</code> in order to drop those commits from your branch.</p></div>

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

 <div id="footer-text">

 Last updated

- 2021-09-10 18:45:11 PDT

+ 2021-10-06 14:16:38 PDT

 </div>

 </div>

 </body>

diff --git a/git-rebase.txt b/git-rebase.txt
index 506345cb0..c116dbf4b 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -446,7 +446,8 @@ When --fork-point is active, 'fork_point' will be used instead of
 ends up being empty, the <upstream> will be used as a fallback.
 +
 If <upstream> is given on the command line, then the default is
-`--no-fork-point`, otherwise the default is `--fork-point`.
+`--no-fork-point`, otherwise the default is `--fork-point`. See also
+`rebase.forkpoint` in linkgit:git-config[1].
 +
 If your branch was based on <upstream> but <upstream> was rewound and
 your branch contains commits which were dropped, this option can be used
diff --git a/git-status.html b/git-status.html
index 8f67d4b9c..af7027460 100644
--- a/git-status.html
+++ b/git-status.html
@@ -1259,7 +1259,7 @@ line types in any order.</p></div>
 a "u" to distinguish from ordinary changed entries.</p></div>

 <div class="literalblock">

 <div class="content">

-<pre><code>u &lt;xy&gt; &lt;sub&gt; &lt;m1&gt; &lt;m2&gt; &lt;m3&gt; &lt;mW&gt; &lt;h1&gt; &lt;h2&gt; &lt;h3&gt; &lt;path&gt;</code></pre>

+<pre><code>u &lt;XY&gt; &lt;sub&gt; &lt;m1&gt; &lt;m2&gt; &lt;m3&gt; &lt;mW&gt; &lt;h1&gt; &lt;h2&gt; &lt;h3&gt; &lt;path&gt;</code></pre>

 </div></div>

 <div class="literalblock">

 <div class="content">

@@ -1361,7 +1361,7 @@ using <code>git --no-optional-locks status</code> (see <a href="git.html">git(1)
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-02-26 23:35:19 PST

+ 2021-10-06 14:16:38 PDT

 </div>

 </div>

 </body>

diff --git a/git-status.txt b/git-status.txt
index 83f38e319..c33a3d8d5 100644
--- a/git-status.txt
+++ b/git-status.txt
@@ -363,7 +363,7 @@ Field       Meaning
 Unmerged entries have the following format; the first character is
 a "u" to distinguish from ordinary changed entries.
 
-    u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
+    u <XY> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
 
 ....
 Field       Meaning
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 6d3ea9bbe..64922c461 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -873,7 +873,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-10-04 12:51:46 PDT

+ 2021-10-06 14:17:15 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index a5e64c2e6..6d1dab7ae 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

- 2021-10-04 12:51:46 PDT

+ 2021-10-06 14:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 290c5ae6f..230d39d32 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

- 2021-10-04 12:51:46 PDT

+ 2021-10-06 14:17:15 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 445f6efbb..a5ae462f4 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

- 2021-10-04 12:51:43 PDT

+ 2021-10-06 14:17:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 8d08067fb..163fe0354 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

- 2021-10-04 12:51:46 PDT

+ 2021-10-06 14:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index c453159f8..1b22416bc 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

- 2021-10-04 12:51:46 PDT

+ 2021-10-06 14:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 33ff18802..9e53b3626 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

- 2021-10-04 12:51:45 PDT

+ 2021-10-06 14:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index b688be04e..e53fcde49 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

- 2021-10-04 12:51:45 PDT

+ 2021-10-06 14:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index db0045885..60f2c7275 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

- 2021-10-04 12:51:45 PDT

+ 2021-10-06 14:17:14 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index f4b5a4c61..563b2146f 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

- 2021-10-04 12:51:43 PDT

+ 2021-10-06 14:17:12 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index de936e4c7..db386ef8c 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

- 2021-10-04 12:51:45 PDT

+ 2021-10-06 14:17:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 3f7dc6543..2e4c51738 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

- 2021-10-04 12:51:44 PDT

+ 2021-10-06 14:17:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 3161ab53b..e65eff875 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

- 2021-10-04 12:51:44 PDT

+ 2021-10-06 14:17:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 38c8764f5..3e771a621 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

- 2021-10-04 12:51:44 PDT

+ 2021-10-06 14:17:13 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 9ad6ba554..bc2df5df3 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

- 2021-10-04 12:51:44 PDT

+ 2021-10-06 14:17:12 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 bbeea3e4d..b16403227 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

- 2021-10-04 12:51:44 PDT

+ 2021-10-06 14:17:13 PDT

 </div>

 </div>

 </body>

diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html
index 9b9e25afe..f1d723972 100644
--- a/technical/multi-pack-index.html
+++ b/technical/multi-pack-index.html
@@ -804,7 +804,9 @@ The MIDX is stored in a file named <em>multi-pack-index</em> in the
 </li>

 <li>

 <p>

-The core.multiPackIndex config setting must be on to consume MIDX files.

+The core.multiPackIndex config setting must be on (which is the

+  default) to consume MIDX files.  Setting it to <code>false</code> prevents

+  Git from reading a MIDX file, even if one exists.

 </p>

 </li>

 <li>

@@ -909,7 +911,7 @@ The partial clone feature records special "promisor" packs that
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-09-20 15:44:03 PDT

+ 2021-10-06 14:16:38 PDT

 </div>

 </div>

 </body>

diff --git a/technical/multi-pack-index.txt b/technical/multi-pack-index.txt
index 1a73c3ee2..86f40f249 100644
--- a/technical/multi-pack-index.txt
+++ b/technical/multi-pack-index.txt
@@ -36,7 +36,9 @@ Design Details
   directory of an alternate. It refers only to packfiles in that
   same directory.
 
-- The core.multiPackIndex config setting must be on to consume MIDX files.
+- The core.multiPackIndex config setting must be on (which is the
+  default) to consume MIDX files.  Setting it to `false` prevents
+  Git from reading a MIDX file, even if one exists.
 
 - The file format includes parameters for the object ID hash
   function, so a future change of hash algorithm does not require