Autogenerated HTML docs for v2.40.0-153-g6369a

19 files changed, 40 insertions, 21 deletions

diff --git a/RelNotes/2.41.0.txt b/RelNotes/2.41.0.txt
index 8ba695133..05b755ac3 100644
--- a/RelNotes/2.41.0.txt
+++ b/RelNotes/2.41.0.txt
@@ -56,6 +56,9 @@ Performance, Internal Implementation, Development Support etc.
    correctly with groff, which has not been necessary since docbook
    1.76 from 2010.
 
+ * Code clean-up to include and/or uninclude parse-options.h file as
+   needed.
+
 
 Fixes since v2.40
 -----------------
@@ -123,6 +126,16 @@ Fixes since v2.40
    filesystem.  Replace all calls to it with a git_time() wrapper and
    (merge 370ddcbc89 pe/time-use-gettimeofday later to maint).
 
+ * Code clean-up to use designated initializers in parse-options API.
+   (merge 353e6d4554 sg/parse-options-h-initializers later to maint).
+
+ * A recent-ish change to allow unicode character classes to be used
+   with "grep -P" triggered a JIT bug in older pcre2 libraries.
+   The problematic change in Git built with these older libraries has
+   been disabled to work around the bug.
+   (merge 14b9a04479 mk/workaround-pcre-jit-ucp-bug later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
    (merge f7111175df as/doc-markup-fix later to maint).
    (merge 90ff7c9898 fc/test-aggregation-clean-up later to maint).
+   (merge 9b0c7f308a jc/am-doc-refer-to-format-patch later to maint).
diff --git a/git-am.html b/git-am.html
index 62a67441f..ff0f2d648 100644
--- a/git-am.html
+++ b/git-am.html
@@ -768,7 +768,9 @@ git-am(1) Manual Page
 <div class="sectionbody">

 <div class="paragraph"><p>Splits mail messages in a mailbox into commit log message,

 authorship information and patches, and applies them to the

-current branch.</p></div>

+current branch. You could think of it as a reverse operation

+of <a href="git-format-patch.html">git-format-patch(1)</a> run on a branch with a straight

+history without merges.</p></div>

 </div>

 </div>

 <div class="sect1">

@@ -1272,7 +1274,8 @@ am.threeWay
 <div class="sect1">

 <h2 id="_see_also">SEE ALSO</h2>

 <div class="sectionbody">

-<div class="paragraph"><p><a href="git-apply.html">git-apply(1)</a>.</p></div>

+<div class="paragraph"><p><a href="git-apply.html">git-apply(1)</a>,

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

 </div>

 </div>

 <div class="sect1">

@@ -1286,7 +1289,7 @@ am.threeWay
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-01-16 13:16:56 PST

+ 2023-03-30 15:50:48 PDT

 </div>

 </div>

 </body>

diff --git a/git-am.txt b/git-am.txt
index 0c1dfb3c9..900be198b 100644
--- a/git-am.txt
+++ b/git-am.txt
@@ -24,7 +24,9 @@ DESCRIPTION
 -----------
 Splits mail messages in a mailbox into commit log message,
 authorship information and patches, and applies them to the
-current branch.
+current branch. You could think of it as a reverse operation
+of linkgit:git-format-patch[1] run on a branch with a straight
+history without merges.
 
 OPTIONS
 -------
@@ -273,7 +275,8 @@ include::config/am.txt[]
 
 SEE ALSO
 --------
-linkgit:git-apply[1].
+linkgit:git-apply[1],
+linkgit:git-format-patch[1].
 
 GIT
 ---
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index b3e75b998..7f822e1ed 100644
--- a/howto/coordinate-embargoed-releases.html
+++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ Thanks,
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-03-28 12:35:04 PDT

+ 2023-03-30 15:51:23 PDT

 </div>

 </div>

 </body>

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

- 2023-03-28 12:35:04 PDT

+ 2023-03-30 15:51:22 PDT

 </div>

 </div>

 </body>

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

 <div id="footer-text">

 Last updated

- 2023-03-28 12:35:04 PDT

+ 2023-03-30 15:51:23 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 220d009bb..9239de50d 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

- 2023-03-28 12:35:02 PDT

+ 2023-03-30 15:51:20 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 7aae1588f..5c1e33b43 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

- 2023-03-28 12:35:04 PDT

+ 2023-03-30 15:51:22 PDT

 </div>

 </div>

 </body>

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

- 2023-03-28 12:35:04 PDT

+ 2023-03-30 15:51:22 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index c5418ccd5..3541378d6 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

- 2023-03-28 12:35:04 PDT

+ 2023-03-30 15:51:22 PDT

 </div>

 </div>

 </body>

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

- 2023-03-28 12:35:04 PDT

+ 2023-03-30 15:51:22 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 48d8702ce..0f035c52b 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

- 2023-03-28 12:35:03 PDT

+ 2023-03-30 15:51:22 PDT

 </div>

 </div>

 </body>

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

- 2023-03-28 12:35:02 PDT

+ 2023-03-30 15:51:21 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 1787e91c4..1d7c448f4 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

- 2023-03-28 12:35:03 PDT

+ 2023-03-30 15:51:22 PDT

 </div>

 </div>

 </body>

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

- 2023-03-28 12:35:03 PDT

+ 2023-03-30 15:51:21 PDT

 </div>

 </div>

 </body>

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

- 2023-03-28 12:35:03 PDT

+ 2023-03-30 15:51:21 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index d5d3902ce..9decf53ad 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

- 2023-03-28 12:35:03 PDT

+ 2023-03-30 15:51:21 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index b20dc3f85..9909113f1 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

- 2023-03-28 12:35:02 PDT

+ 2023-03-30 15:51:21 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 2a19b1c75..8e1e2594d 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

- 2023-03-28 12:35:02 PDT

+ 2023-03-30 15:51:21 PDT

 </div>

 </div>

 </body>