Autogenerated HTML docs for v2.31.1-163-ga65ce

20 files changed, 80 insertions, 56 deletions

diff --git a/RelNotes/2.32.0.txt b/RelNotes/2.32.0.txt
index 6f69a521a..f39eede00 100644
--- a/RelNotes/2.32.0.txt
+++ b/RelNotes/2.32.0.txt
@@ -40,6 +40,13 @@ UI, Workflows & Features
    tweak both the message and the contents, and only the message,
    respectively.
 
+ * When accessing a server with a URL like https://user:pass@site/, we
+   did not to fall back to the basic authentication with the
+   credential material embedded in the URL after the "Negotiate"
+   authentication failed.  Now we do.
+
+ * "git send-email" learned to honor the core.hooksPath configuration.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -66,29 +73,22 @@ Fixes since v2.31
  * The fsmonitor interface read from its input without making sure
    there is something to read from.  This bug is new in 2.31
    timeframe.
-   (merge 097ea2c848 jh/fsmonitor-prework later to maint).
 
  * The data structure used by fsmonitor interface was not properly
    duplicated during an in-core merge, leading to use-after-free etc.
-   (merge 4abc57848d js/fsmonitor-unpack-fix later to maint).
 
  * "git bisect" reimplemented more in C during 2.30 timeframe did not
    take an annotated tag as a good/bad endpoint well.  This regression
    has been corrected.
-   (merge 7730f85594 jk/bisect-peel-tag-fix later to maint).
 
  * Fix macros that can silently inject unintended null-statements.
-   (merge 116affac3f rs/avoid-null-statement-after-macro-call later to maint).
 
  * CALLOC_ARRAY() macro replaces many uses of xcalloc().
-   (merge 1c57cc70ec rs/calloc-array later to maint).
 
  * Update insn in Makefile comments to run fuzz-all target.
-   (merge 68b5c3aa48 ah/make-fuzz-all-doc-update later to maint).
 
  * Fix a corner case bug in "git mv" on case insensitive systems,
    which was introduced in 2.29 timeframe.
-   (merge 93c3d297b5 tb/git-mv-icase-fix later to maint).
 
  * We had a code to diagnose and die cleanly when a required
    clean/smudge filter is missing, but an assert before that
@@ -115,15 +115,20 @@ Fixes since v2.31
    which has been corrected.
    (merge 75555676ad bc/clone-bare-with-conflicting-config later to maint).
 
+ * When "git checkout" removes a path that does not exist in the
+   commit it is checking out, it wasn't careful enough not to follow
+   symbolic links, which has been corrected.
+   (merge fab78a0c3d mt/checkout-remove-nofollow later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
-   (merge 486f4bd183 jc/calloc-fix later to maint).
-   (merge 5f70859c15 jt/clone-unborn-head later to maint).
-   (merge cfd409ed09 km/config-doc-typofix later to maint).
-   (merge 8588aa8657 jk/slimmed-down later to maint).
-   (merge 241b5d3ebe rs/xcalloc-takes-nelem-first later to maint).
    (merge f451960708 dl/cat-file-doc-cleanup later to maint).
    (merge 12604a8d0c sv/t9801-test-path-is-file-cleanup later to maint).
    (merge ea7e63921c jr/doc-ignore-typofix later to maint).
    (merge 23c781f173 ps/update-ref-trans-hook-doc later to maint).
    (merge 42efa1231a jk/filter-branch-sha256 later to maint).
    (merge 4c8e3dca6e tb/push-simple-uses-branch-merge-config later to maint).
+   (merge 6534d436a2 bs/asciidoctor-installation-hints later to maint).
+   (merge 47957485b3 ab/read-tree later to maint).
+   (merge 2be927f3d1 ab/diff-no-index-tests later to maint).
+   (merge 76593c09bb ab/detox-gettext-tests later to maint).
+   (merge 28e29ee38b jc/doc-format-patch-clarify later to maint).
diff --git a/git-config.html b/git-config.html
index 54a481539..69b6a8b80 100644
--- a/git-config.html
+++ b/git-config.html
@@ -8412,18 +8412,6 @@ push.useForceIfIncludes
 </p>

 </dd>

 <dt class="hdlist1">

-rebase.useBuiltin

-</dt>

-<dd>

-<p>

-        Unused configuration variable. Used in Git versions 2.20 and

-        2.21 as an escape hatch to enable the legacy shellscript

-        implementation of rebase. 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.

-</p>

-</dd>

-<dt class="hdlist1">

 rebase.backend

 </dt>

 <dd>

diff --git a/git-format-patch.html b/git-format-patch.html
index f9929c432..a7bcc60f2 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -779,10 +779,36 @@ git-format-patch(1) Manual Page
 <div class="sect1">

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Prepare each commit with its patch in

-one file per commit, formatted to resemble UNIX mailbox format.

+<div class="paragraph"><p>Prepare each commit with its "patch" in

+one "message" per commit, formatted to resemble a UNIX mailbox.

 The output of this command is convenient for e-mail submission or

 for use with <em>git am</em>.</p></div>

+<div class="paragraph"><p>A "message" generated by the command consists of three parts:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+A brief metadata header that begins with <code>From &lt;commit&gt;</code>

+  with a fixed <code>Mon Sep 17 00:00:00 2001</code> datestamp to help programs

+  like "file(1)" to recognize that the file is an output from this

+  command, fields that record the author identity, the author date,

+  and the title of the change (taken from the first paragraph of the

+  commit log message).

+</p>

+</li>

+<li>

+<p>

+The second and subsequent paragraphs of the commit log message.

+</p>

+</li>

+<li>

+<p>

+The "patch", which is the "diff -p --stat" output (see

+  <a href="git-diff.html">git-diff(1)</a>) between the commit and its parent.

+</p>

+</li>

+</ul></div>

+<div class="paragraph"><p>The log message and the patch is separated by a line with a

+three-dash line.</p></div>

 <div class="paragraph"><p>There are two ways to specify which commits to operate on.</p></div>

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

 <li>

@@ -2523,7 +2549,7 @@ Extract three topmost commits from the current branch and format them
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2020-11-23 11:57:47 PST

+ 2021-03-30 15:09:45 PDT

 </div>

 </div>

 </body>

diff --git a/git-format-patch.txt b/git-format-patch.txt
index 3e49bf221..5cd8578b6 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -36,11 +36,28 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Prepare each commit with its patch in
-one file per commit, formatted to resemble UNIX mailbox format.
+Prepare each commit with its "patch" in
+one "message" per commit, formatted to resemble a UNIX mailbox.
 The output of this command is convenient for e-mail submission or
 for use with 'git am'.
 
+A "message" generated by the command consists of three parts:
+
+* A brief metadata header that begins with `From <commit>`
+  with a fixed `Mon Sep 17 00:00:00 2001` datestamp to help programs
+  like "file(1)" to recognize that the file is an output from this
+  command, fields that record the author identity, the author date,
+  and the title of the change (taken from the first paragraph of the
+  commit log message).
+
+* The second and subsequent paragraphs of the commit log message.
+
+* The "patch", which is the "diff -p --stat" output (see
+  linkgit:git-diff[1]) between the commit and its parent.
+
+The log message and the patch is separated by a line with a
+three-dash line.
+
 There are two ways to specify which commits to operate on.
 
 1. A single commit, <since>, specifies that the commits leading
diff --git a/git-rebase.html b/git-rebase.html
index c7ba2f800..467b503fa 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -932,18 +932,6 @@ desired resolution, you can continue the rebasing process with</p></div>
 <div class="sectionbody">

 <div class="dlist"><dl>

 <dt class="hdlist1">

-rebase.useBuiltin

-</dt>

-<dd>

-<p>

-        Unused configuration variable. Used in Git versions 2.20 and

-        2.21 as an escape hatch to enable the legacy shellscript

-        implementation of rebase. 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.

-</p>

-</dd>

-<dt class="hdlist1">

 rebase.backend

 </dt>

 <dd>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index dd75910b7..e3b748ead 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-03-26 15:45:16 PDT

+ 2021-03-30 15:10:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 7feae8eca..8437307c2 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-03-26 15:45:17 PDT

+ 2021-03-30 15:10:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 911db3ab5..2b71743fd 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-03-26 15:45:13 PDT

+ 2021-03-30 15:10:37 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 3ef733571..a28150d4e 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-03-26 15:45:16 PDT

+ 2021-03-30 15:10:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 5578a70c7..1721bca08 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-03-26 15:45:16 PDT

+ 2021-03-30 15:10:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index fc82baf9c..afadf506a 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-03-26 15:45:16 PDT

+ 2021-03-30 15:10:40 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index f67fb81e1..40b66dd9e 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-03-26 15:45:16 PDT

+ 2021-03-30 15:10:41 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index b0b6f9dd5..99fc1addd 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-03-26 15:45:15 PDT

+ 2021-03-30 15:10:40 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 8f7789c3a..e4c48b251 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-03-26 15:45:13 PDT

+ 2021-03-30 15:10:38 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 965eeb804..f222f189e 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-03-26 15:45:15 PDT

+ 2021-03-30 15:10:40 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 9803a832a..82a0ea961 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-03-26 15:45:15 PDT

+ 2021-03-30 15:10:39 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index ac2812402..e4cfa6434 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-03-26 15:45:14 PDT

+ 2021-03-30 15:10:39 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index ebb9214c8..f0f4b2c79 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-03-26 15:45:14 PDT

+ 2021-03-30 15:10:39 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 2cdd80e5d..7a48153ea 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-03-26 15:45:14 PDT

+ 2021-03-30 15:10:38 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 e6d13b0ad..7cb4d5762 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-03-26 15:45:14 PDT

+ 2021-03-30 15:10:38 PDT

 </div>

 </div>

 </body>