Autogenerated HTML docs for v2.38.0-83-gd420d

21 files changed, 44 insertions, 28 deletions

diff --git a/RelNotes/2.39.0.txt b/RelNotes/2.39.0.txt
index a26c82444..a6ee7c899 100644
--- a/RelNotes/2.39.0.txt
+++ b/RelNotes/2.39.0.txt
@@ -66,9 +66,25 @@ Fixes since v2.38
    led to a segfault (which is bad), which has been corrected.
    (merge 92481d1b26 js/merge-ort-in-read-only-repo later to maint).
 
+ * Force C locale while running tests around httpd to make sure we can
+   find expected error messages in the log.
+   (merge 7a2d8ea47e rs/test-httpd-in-C-locale later to maint).
+
+ * Fix a logic in "mailinfo -b" that miscomputed the length of a
+   substring, which lead to an out-of-bounds access.
+   (merge 3ef1494685 pw/mailinfo-b-fix later to maint).
+
+ * The codepath to sign learned to report errors when it fails to read
+   from "ssh-keygen".
+   (merge 36fb0d07d8 pw/ssh-sign-report-errors later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge c34a6bd291 so/diff-merges-cleanup later to maint).
    (merge 5e7c8b75e7 ab/test-malloc-with-sanitize-leak later to maint).
    (merge 2a905f8fa8 ah/branch-autosetupmerge-grammofix later to maint).
    (merge abcac2e19f rj/ref-filter-get-head-description-leakfix later to maint).
    (merge 71e5473493 hn/parse-worktree-ref later to maint).
+   (merge 7190b7ebf9 ds/bundle-uri-docfix later to maint).
+   (merge 45350aeb11 jk/sequencer-missing-author-name-check later to maint).
+   (merge edbf9a2e20 nb/doc-mergetool-typofix later to maint).
+   (merge b004c90282 rs/gc-pack-refs-simplify later to maint).
diff --git a/git-config.html b/git-config.html
index c9f5c855f..541b82775 100644
--- a/git-config.html
+++ b/git-config.html
@@ -8503,7 +8503,7 @@ mergetool.hideResolved
         possible and write the <em>MERGED</em> file containing conflict markers around

         any conflicts that it cannot resolve; <em>LOCAL</em> and <em>REMOTE</em> normally

         represent the versions of the file from before Git&#8217;s conflict

-        resolution. This flag causes <em>LOCAL</em> and <em>REMOTE</em> to be overwriten so

+        resolution. This flag causes <em>LOCAL</em> and <em>REMOTE</em> to be overwritten so

         that only the unresolved conflicts are presented to the merge tool. Can

         be configured per-tool via the <code>mergetool.&lt;tool&gt;.hideResolved</code>

         configuration variable. Defaults to <code>false</code>.

diff --git a/git-mergetool.html b/git-mergetool.html
index f640addad..dc6726b54 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -988,7 +988,7 @@ mergetool.hideResolved
         possible and write the <em>MERGED</em> file containing conflict markers around

         any conflicts that it cannot resolve; <em>LOCAL</em> and <em>REMOTE</em> normally

         represent the versions of the file from before Git&#8217;s conflict

-        resolution. This flag causes <em>LOCAL</em> and <em>REMOTE</em> to be overwriten so

+        resolution. This flag causes <em>LOCAL</em> and <em>REMOTE</em> to be overwritten so

         that only the unresolved conflicts are presented to the merge tool. Can

         be configured per-tool via the <code>mergetool.&lt;tool&gt;.hideResolved</code>

         configuration variable. Defaults to <code>false</code>.

diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 0a183adbd..48de33e69 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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:52 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 177292fe9..0e8d7db56 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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:51 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 1401d2d97..61ee5f47e 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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:52 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index e05e08963..842daa718 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

- 2022-10-10 14:40:50 PDT

+ 2022-10-11 11:07:49 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 64f5cf4af..1f4a7bbf6 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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:51 PDT

 </div>

 </div>

 </body>

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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:51 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index ff815c4b3..5e4f2b23d 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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:51 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 3b2363f23..122f45f8e 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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:51 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 81c4f03ae..84383b02d 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

- 2022-10-10 14:40:52 PDT

+ 2022-10-11 11:07:51 PDT

 </div>

 </div>

 </body>

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

- 2022-10-10 14:40:50 PDT

+ 2022-10-11 11:07:49 PDT

 </div>

 </div>

 </body>

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

- 2022-10-10 14:40:51 PDT

+ 2022-10-11 11:07:51 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index ff1c4a18d..ffe2c0189 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

- 2022-10-10 14:40:51 PDT

+ 2022-10-11 11:07:50 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 5a831fc09..80bf34ca8 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

- 2022-10-10 14:40:51 PDT

+ 2022-10-11 11:07:50 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index d95774d70..cbe699c57 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

- 2022-10-10 14:40:51 PDT

+ 2022-10-11 11:07:50 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 649fe6a82..8ca3ba198 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

- 2022-10-10 14:40:50 PDT

+ 2022-10-11 11:07:50 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 1fc5fe354..8ee55b8ae 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

- 2022-10-10 14:40:51 PDT

+ 2022-10-11 11:07:50 PDT

 </div>

 </div>

 </body>

diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html
index f22657a9b..10ee76499 100644
--- a/technical/bundle-uri.html
+++ b/technical/bundle-uri.html
@@ -942,8 +942,8 @@ bundle.&lt;id&gt;.creationToken
 <dd>

 <p>

         This value is a nonnegative 64-bit integer used for sorting the bundles

-        the list. This is used to download a subset of bundles during a fetch

-        when <code>bundle.heuristic=creationToken</code>.

+        list. This is used to download a subset of bundles during a fetch when

+        <code>bundle.heuristic=creationToken</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1052,10 +1052,10 @@ If the downloaded data from a bundle URI is a bundle, then the client
    making those OIDs present. When all required OIDs are present, the

    client unbundles that data using a refspec. The default refspec is

    <code>+refs/heads/*:refs/bundles/*</code>, but this can be configured. These refs

-   are stored so that later <code>git fetch</code> negotiations can communicate the

-   bundled refs as <code>have`s, reducing the size of the fetch over the Git

+   are stored so that later <code>git fetch</code> negotiations can communicate each

+   bundled ref as a <code>have</code>, reducing the size of the fetch over the Git

    protocol. To allow pruning refs from this ref namespace, Git may

-   introduce a numbered namespace (such as `refs/bundles/&lt;i&gt;/*</code>) such that

+   introduce a numbered namespace (such as <code>refs/bundles/&lt;i&gt;/*</code>) such that

    stale bundle refs can be deleted.

 </p>

 </li>

@@ -1463,7 +1463,7 @@ would cause these on-demand downloads to be too aggressive.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-09-21 15:44:34 PDT

+ 2022-10-11 11:07:16 PDT

 </div>

 </div>

 </body>

diff --git a/technical/bundle-uri.txt b/technical/bundle-uri.txt
index 18f2dedd4..b78d01d9a 100644
--- a/technical/bundle-uri.txt
+++ b/technical/bundle-uri.txt
@@ -153,8 +153,8 @@ bundle.<id>.filter::
 
 bundle.<id>.creationToken::
 	This value is a nonnegative 64-bit integer used for sorting the bundles
-	the list. This is used to download a subset of bundles during a fetch
-	when `bundle.heuristic=creationToken`.
+	list. This is used to download a subset of bundles during a fetch when
+	`bundle.heuristic=creationToken`.
 
 bundle.<id>.location::
 	This string value advertises a real-world location from where the bundle
@@ -234,8 +234,8 @@ will interact with bundle URIs according to the following flow:
    making those OIDs present. When all required OIDs are present, the
    client unbundles that data using a refspec. The default refspec is
    `+refs/heads/*:refs/bundles/*`, but this can be configured. These refs
-   are stored so that later `git fetch` negotiations can communicate the
-   bundled refs as `have`s, reducing the size of the fetch over the Git
+   are stored so that later `git fetch` negotiations can communicate each
+   bundled ref as a `have`, reducing the size of the fetch over the Git
    protocol. To allow pruning refs from this ref namespace, Git may
    introduce a numbered namespace (such as `refs/bundles/<i>/*`) such that
    stale bundle refs can be deleted.