Autogenerated HTML docs for v2.32.0-349-gdaab8

27 files changed, 100 insertions, 37 deletions

diff --git a/RelNotes/2.33.0.txt b/RelNotes/2.33.0.txt
index d1e92766b..d4c56de5c 100644
--- a/RelNotes/2.33.0.txt
+++ b/RelNotes/2.33.0.txt
@@ -50,6 +50,10 @@ Performance, Internal Implementation, Development Support etc.
  * The backend for "diff -G/-S" has been updated to use pcre2 engine
    when available.
 
+ * Use ".DELETE_ON_ERROR" pseudo target to simplify our Makefile.
+
+ * Code cleanup around struct_type_init() functions.
+
 
 Fixes since v2.32
 -----------------
@@ -151,6 +155,26 @@ Fixes since v2.32
    but instead segfaulted, which has been corrected.
    (merge fe7fe62d8d rs/grep-parser-fix later to maint).
 
+ * The merge code had funny interactions between content based rename
+   detection and directory rename detection.
+   (merge 3585d0ea23 en/merge-dir-rename-corner-case-fix later to maint).
+
+ * When rebuilding the multi-pack index file reusing an existing one,
+   we used to blindly trust the existing file and ended up carrying
+   corrupted data into the updated file, which has been corrected.
+   (merge f89ecf7988 tb/midx-use-checksum later to maint).
+
+ * Update the location of system-side configuration file on Windows.
+   (merge e355307692 js/gfw-system-config-loc-fix later to maint).
+
+ * Code recently added to support common ancestry negotiation during
+   "git push" did not sanity check its arguments carefully enough.
+   (merge eff40457a4 ab/fetch-negotiate-segv-fix later to maint).
+
+ * Update the documentation not to assume users are of certain gender
+   and adds to guidelines to do so.
+   (merge 46a237f42f ds/gender-neutral-doc later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge bfe35a6165 ah/doc-describe later to maint).
    (merge f302c1e4aa jc/clarify-revision-range later to maint).
@@ -179,3 +203,8 @@ Fixes since v2.32
    (merge ce24797d38 mr/cmake later to maint).
    (merge 9eb542f2ee ab/pre-auto-gc-hook-test later to maint).
    (merge 9fffc38583 bk/doc-commit-typofix later to maint).
+   (merge 1cf823d8f0 ks/submodule-cleanup later to maint).
+   (merge ebbf5d2b70 js/config-mak-windows-pcre-fix later to maint).
+   (merge 617480d75b hn/refs-iterator-peel-returns-boolean later to maint).
+   (merge 6a24cc71ed ar/submodule-helper-include-cleanup later to maint).
+   (merge 5632e838f8 rs/khash-alloc-cleanup later to maint).
diff --git a/SubmittingPatches.html b/SubmittingPatches.html
index ed88d0634..8642c417a 100644
--- a/SubmittingPatches.html
+++ b/SubmittingPatches.html
@@ -1113,9 +1113,8 @@ don&#8217;t hide your real name.</p></div>
 <li>

 <p>

 <code>Reviewed-by:</code>, unlike the other tags, can only be offered by the

-  reviewer and means that she is completely satisfied that the patch

-  is ready for application.  It is usually offered only after a

-  detailed review.

+  reviewers themselves when they are completely satisfied with the

+  patch after a detailed analysis.

 </p>

 </li>

 <li>

@@ -1396,7 +1395,7 @@ this problem around.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-06-06 01:02:00 PDT

+ 2021-07-19 14:01:20 PDT

 </div>

 </div>

 </body>

diff --git a/SubmittingPatches.txt b/SubmittingPatches.txt
index 55287d72e..3e215f4d8 100644
--- a/SubmittingPatches.txt
+++ b/SubmittingPatches.txt
@@ -373,9 +373,8 @@ If you like, you can put extra tags at the end:
 . `Acked-by:` says that the person who is more familiar with the area
   the patch attempts to modify liked the patch.
 . `Reviewed-by:`, unlike the other tags, can only be offered by the
-  reviewer and means that she is completely satisfied that the patch
-  is ready for application.  It is usually offered only after a
-  detailed review.
+  reviewers themselves when they are completely satisfied with the
+  patch after a detailed analysis.
 . `Tested-by:` is used to indicate that the person applied the patch
   and found it to have the desired effect.
 
diff --git a/fetch-options.txt b/fetch-options.txt
index 9e7b4e189..e967ff187 100644
--- a/fetch-options.txt
+++ b/fetch-options.txt
@@ -62,8 +62,17 @@ The argument to this option may be a glob on ref names, a ref, or the (possibly
 abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying
 this option multiple times, one for each matching ref name.
 +
-See also the `fetch.negotiationAlgorithm` configuration variable
-documented in linkgit:git-config[1].
+See also the `fetch.negotiationAlgorithm` and `push.negotiate`
+configuration variables documented in linkgit:git-config[1], and the
+`--negotiate-only` option below.
+
+--negotiate-only::
+	Do not fetch anything from the server, and instead print the
+	ancestors of the provided `--negotiation-tip=*` arguments,
+	which we have in common with the server.
++
+Internally this is used to implement the `push.negotiate` option, see
+linkgit:git-config[1].
 
 --dry-run::
 	Show what would be done, without making any changes.
diff --git a/git-config.html b/git-config.html
index fe76e1211..3b522edc0 100644
--- a/git-config.html
+++ b/git-config.html
@@ -5048,7 +5048,8 @@ fetch.negotiationAlgorithm
         setting defaults to "skipping".

         Unknown values will cause <em>git fetch</em> to error out.

 </p>

-<div class="paragraph"><p>See also the <code>--negotiation-tip</code> option for <a href="git-fetch.html">git-fetch(1)</a>.</p></div>

+<div class="paragraph"><p>See also the <code>--negotiate-only</code> and <code>--negotiation-tip</code> options to

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

 </dd>

 <dt class="hdlist1">

 fetch.showForcedUpdates

diff --git a/git-fetch.html b/git-fetch.html
index 36cc94c25..ef6b0a969 100644
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -898,8 +898,21 @@ commits reachable from any of the given commits.</p></div>
 <div class="paragraph"><p>The argument to this option may be a glob on ref names, a ref, or the (possibly

 abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying

 this option multiple times, one for each matching ref name.</p></div>

-<div class="paragraph"><p>See also the <code>fetch.negotiationAlgorithm</code> configuration variable

-documented in <a href="git-config.html">git-config(1)</a>.</p></div>

+<div class="paragraph"><p>See also the <code>fetch.negotiationAlgorithm</code> and <code>push.negotiate</code>

+configuration variables documented in <a href="git-config.html">git-config(1)</a>, and the

+<code>--negotiate-only</code> option below.</p></div>

+</dd>

+<dt class="hdlist1">

+--negotiate-only

+</dt>

+<dd>

+<p>

+        Do not fetch anything from the server, and instead print the

+        ancestors of the provided <code>--negotiation-tip=*</code> arguments,

+        which we have in common with the server.

+</p>

+<div class="paragraph"><p>Internally this is used to implement the <code>push.negotiate</code> option, see

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

 </dd>

 <dt class="hdlist1">

 --dry-run

diff --git a/git-pull.html b/git-pull.html
index b769143b5..1ce7ecc25 100644
--- a/git-pull.html
+++ b/git-pull.html
@@ -1276,8 +1276,21 @@ commits reachable from any of the given commits.</p></div>
 <div class="paragraph"><p>The argument to this option may be a glob on ref names, a ref, or the (possibly

 abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying

 this option multiple times, one for each matching ref name.</p></div>

-<div class="paragraph"><p>See also the <code>fetch.negotiationAlgorithm</code> configuration variable

-documented in <a href="git-config.html">git-config(1)</a>.</p></div>

+<div class="paragraph"><p>See also the <code>fetch.negotiationAlgorithm</code> and <code>push.negotiate</code>

+configuration variables documented in <a href="git-config.html">git-config(1)</a>, and the

+<code>--negotiate-only</code> option below.</p></div>

+</dd>

+<dt class="hdlist1">

+--negotiate-only

+</dt>

+<dd>

+<p>

+        Do not fetch anything from the server, and instead print the

+        ancestors of the provided <code>--negotiation-tip=*</code> arguments,

+        which we have in common with the server.

+</p>

+<div class="paragraph"><p>Internally this is used to implement the <code>push.negotiate</code> option, see

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

 </dd>

 <dt class="hdlist1">

 --dry-run

diff --git a/git-push.html b/git-push.html
index 3b375790d..5a60e9fca 100644
--- a/git-push.html
+++ b/git-push.html
@@ -1070,8 +1070,8 @@ remote ref is the expected value.  "git push" fails otherwise.</p></div>
 You will have to bypass the "must fast-forward" rule in order to

 replace the history you originally published with the rebased history.

 If somebody else built on top of your original history while you are

-rebasing, the tip of the branch at the remote may advance with her

-commit, and blindly pushing with <code>--force</code> will lose her work.</p></div>

+rebasing, the tip of the branch at the remote may advance with their

+commit, and blindly pushing with <code>--force</code> will lose their work.</p></div>

 <div class="paragraph"><p>This option allows you to say that you expect the history you are

 updating is what you rebased and want to replace. If the remote ref

 still points at the commit you specified, you can be sure that no

@@ -1971,7 +1971,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-03-24 15:15:46 PDT

+ 2021-07-19 14:01:20 PDT

 </div>

 </div>

 </body>

diff --git a/git-push.txt b/git-push.txt
index a953c7c38..2f25aa3a2 100644
--- a/git-push.txt
+++ b/git-push.txt
@@ -244,8 +244,8 @@ Imagine that you have to rebase what you have already published.
 You will have to bypass the "must fast-forward" rule in order to
 replace the history you originally published with the rebased history.
 If somebody else built on top of your original history while you are
-rebasing, the tip of the branch at the remote may advance with her
-commit, and blindly pushing with `--force` will lose her work.
+rebasing, the tip of the branch at the remote may advance with their
+commit, and blindly pushing with `--force` will lose their work.
 +
 This option allows you to say that you expect the history you are
 updating is what you rebased and want to replace. If the remote ref
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 8ce7797ec..c594ea88f 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-07-13 17:38:46 PDT

+ 2021-07-19 14:02:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 5f125da5f..7ae668d5e 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-07-13 17:38:46 PDT

+ 2021-07-19 14:02:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index b72c3ee48..331bdae30 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-07-13 17:38:46 PDT

+ 2021-07-19 14:02:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index b37d727e4..109d4a35b 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-07-13 17:38:43 PDT

+ 2021-07-19 14:02:08 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 7f2eb6c3c..df024c79c 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-07-13 17:38:46 PDT

+ 2021-07-19 14:02:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index a710d2831..b107e7f68 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-07-13 17:38:46 PDT

+ 2021-07-19 14:02:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 3d90d897a..6c1194a4e 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-07-13 17:38:45 PDT

+ 2021-07-19 14:02:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index f3396e2c6..ba746164f 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-07-13 17:38:46 PDT

+ 2021-07-19 14:02:11 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 72ba9a027..7265fcf58 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-07-13 17:38:45 PDT

+ 2021-07-19 14:02:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index f53907084..653896001 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-07-13 17:38:43 PDT

+ 2021-07-19 14:02:08 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 85c4d2bde..5fc28e661 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-07-13 17:38:45 PDT

+ 2021-07-19 14:02:10 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 92e98c615..993c4db34 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-07-13 17:38:44 PDT

+ 2021-07-19 14:02:09 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 7a79420d4..edf399312 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-07-13 17:38:44 PDT

+ 2021-07-19 14:02:09 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index be3213f36..450801af0 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-07-13 17:38:44 PDT

+ 2021-07-19 14:02:09 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index abb5ec485..8ed3b7985 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-07-13 17:38:43 PDT

+ 2021-07-19 14:02:08 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 20818dfe1..c110843d9 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-07-13 17:38:43 PDT

+ 2021-07-19 14:02:08 PDT

 </div>

 </div>

 </body>

diff --git a/user-manual.html b/user-manual.html
index 676562d3d..2a9427231 100644
--- a/user-manual.html
+++ b/user-manual.html
@@ -1206,7 +1206,7 @@ commit.  Git calls this process a <a class="link" href="#fast-forwards" title="F
            \
             o--o--o &lt;-- new head of the branch</pre><p>In some cases it is possible that the new head will <span class="strong"><strong>not</strong></span> actually be
 a descendant of the old head.  For example, the developer may have
-realized she made a serious mistake, and decided to backtrack,
+realized a serious mistake was made and decided to backtrack,
 resulting in a situation like:</p><pre class="literallayout"> o--o--o--o--a--b &lt;-- old head of the branch
            \
             o--o--o &lt;-- new head of the branch</pre><p>In this case, <code class="literal">git fetch</code> will fail, and print out a warning.</p><p>In that case, you can still force Git to update to the new head, as
diff --git a/user-manual.txt b/user-manual.txt
index f9e54b867..96240598e 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -2792,7 +2792,7 @@ A fast-forward looks something like this:
 
 In some cases it is possible that the new head will *not* actually be
 a descendant of the old head.  For example, the developer may have
-realized she made a serious mistake, and decided to backtrack,
+realized a serious mistake was made and decided to backtrack,
 resulting in a situation like:
 
 ................................................