Autogenerated HTML docs for v2.40.0-374-g7580f

25 files changed, 72 insertions, 24 deletions

diff --git a/RelNotes/2.41.0.txt b/RelNotes/2.41.0.txt
index d6721eb5c..abbaff309 100644
--- a/RelNotes/2.41.0.txt
+++ b/RelNotes/2.41.0.txt
@@ -65,6 +65,10 @@ UI, Workflows & Features
    has symbolic links inside its $GIT_DIR; an error message when that
    happens has been updated.
 
+ * "git branch --format=..." and "git format-patch --format=..."
+   learns "--omit-empty" to hide refs that whose formatting result
+   becomes an empty string from the output.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -229,6 +233,13 @@ Fixes since v2.40
  * Code clean-up to replace a hardcoded constant with a CPP macro.
    (merge c870de6502 rs/get-tar-commit-id-use-defined-const later to maint).
 
+ * Doc build simplification.
+   (merge 9a09ed3229 fc/doc-stop-using-manversion later to maint).
+
+ * "git archive" run from a subdirectory mishandled attributes and
+   paths outside the current directory.
+   (merge 92b1dd1b9e rs/archive-from-subdirectory-fixes 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).
diff --git a/git-branch.html b/git-branch.html
index 64e50d565..76182852b 100644
--- a/git-branch.html
+++ b/git-branch.html
@@ -957,6 +957,15 @@ in another worktree linked to the same repository.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--omit-empty

+</dt>

+<dd>

+<p>

+        Do not print a newline after formatted refs where the format expands

+        to the empty string.

+</p>

+</dd>

+<dt class="hdlist1">

 --column[=&lt;options&gt;]

 </dt>

 <dt class="hdlist1">

@@ -1583,7 +1592,7 @@ a branch?&#8221;</a> in the Git User&#8217;s Manual.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-01-27 09:44:35 PST

+ 2023-04-21 15:58:28 PDT

 </div>

 </div>

 </body>

diff --git a/git-branch.txt b/git-branch.txt
index d382ac69f..d207da910 100644
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -156,6 +156,10 @@ in another worktree linked to the same repository.
 --ignore-case::
 	Sorting and filtering branches are case insensitive.
 
+--omit-empty::
+	Do not print a newline after formatted refs where the format expands
+	to the empty string.
+
 --column[=<options>]::
 --no-column::
 	Display branch listing in columns. See configuration variable
diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index 6eac2e17d..9483a4827 100644
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -916,6 +916,15 @@ host language allowing their direct evaluation in that language.</p></div>
         Sorting and filtering refs are case insensitive.

 </p>

 </dd>

+<dt class="hdlist1">

+--omit-empty

+</dt>

+<dd>

+<p>

+        Do not print a newline after formatted refs where the format expands

+        to the empty string.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1358,7 +1367,7 @@ commits and from none of the <code>--no-merged</code> commits are shown.</p></di
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-04-06 13:56:57 PDT

+ 2023-04-21 15:58:28 PDT

 </div>

 </div>

 </body>

diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt
index 0713e49b4..1e215d4e7 100644
--- a/git-for-each-ref.txt
+++ b/git-for-each-ref.txt
@@ -98,6 +98,10 @@ OPTIONS
 --ignore-case::
 	Sorting and filtering refs are case insensitive.
 
+--omit-empty::
+	Do not print a newline after formatted refs where the format expands
+	to the empty string.
+
 FIELD NAMES
 -----------
 
diff --git a/git-format-patch.html b/git-format-patch.html
index 9a5b39b9b..39ab69211 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -1775,8 +1775,7 @@ series, where the head is chosen from the cover letter, the
 <code>--in-reply-to</code>, and the first patch mail, in this order.  <em>deep</em>

 threading makes every mail a reply to the previous one.</p></div>

 <div class="paragraph"><p>The default is <code>--no-thread</code>, unless the <code>format.thread</code> configuration

-is set.  If <code>--thread</code> is specified without a style, it defaults to the

-style specified by <code>format.thread</code> if any, or else <code>shallow</code>.</p></div>

+is set.  <code>--thread</code> without an argument is equivalent to <code>--thread=shallow</code>.</p></div>

 <div class="paragraph"><p>Beware that the default for <em>git send-email</em> is to thread emails

 itself.  If you want <code>git format-patch</code> to take care of threading, you

 will want to ensure that threading is disabled for <code>git send-email</code>.</p></div>

@@ -2604,7 +2603,7 @@ merge commit.</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2023-04-11 13:51:23 PDT

+ 2023-04-21 15:58:28 PDT

 </div>

 </div>

 </body>

diff --git a/git-format-patch.txt b/git-format-patch.txt
index 508f3ae2c..b1c13fb39 100644
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -173,8 +173,7 @@ series, where the head is chosen from the cover letter, the
 threading makes every mail a reply to the previous one.
 +
 The default is `--no-thread`, unless the `format.thread` configuration
-is set.  If `--thread` is specified without a style, it defaults to the
-style specified by `format.thread` if any, or else `shallow`.
+is set.  `--thread` without an argument is equivalent to `--thread=shallow`.
 +
 Beware that the default for 'git send-email' is to thread emails
 itself.  If you want `git format-patch` to take care of threading, you
diff --git a/git-tag.html b/git-tag.html
index a85796d26..46706f10f 100644
--- a/git-tag.html
+++ b/git-tag.html
@@ -943,6 +943,15 @@ options for details.</p></div>
 </p>

 </dd>

 <dt class="hdlist1">

+--omit-empty

+</dt>

+<dd>

+<p>

+        Do not print a newline after formatted refs where the format expands

+        to the empty string.

+</p>

+</dd>

+<dt class="hdlist1">

 --column[=&lt;options&gt;]

 </dt>

 <dt class="hdlist1">

@@ -1339,7 +1348,7 @@ commits and from none of the <code>--no-merged</code> commits are shown.</p></di
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-10-28 11:53:56 PDT

+ 2023-04-21 15:58:28 PDT

 </div>

 </div>

 </body>

diff --git a/git-tag.txt b/git-tag.txt
index fdc72b587..7f61c1edb 100644
--- a/git-tag.txt
+++ b/git-tag.txt
@@ -131,6 +131,10 @@ options for details.
 --ignore-case::
 	Sorting and filtering tags are case insensitive.
 
+--omit-empty::
+	Do not print a newline after formatted refs where the format expands
+	to the empty string.
+
 --column[=<options>]::
 --no-column::
 	Display tag listing in columns. See configuration variable
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 7c4770a09..53c5241f6 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-04-20 15:18:41 PDT

+ 2023-04-21 15:59:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 519fb717b..2d2aa2a69 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-04-20 15:18:41 PDT

+ 2023-04-21 15:59:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 54f92cf09..80ea12cb7 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-04-20 15:18:41 PDT

+ 2023-04-21 15:59:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 8129ccf84..fab20c381 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-04-20 15:18:39 PDT

+ 2023-04-21 15:59:01 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 31c2911dc..f167c6c65 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-04-20 15:18:41 PDT

+ 2023-04-21 15:59:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 5669d6f38..0e076ae06 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-04-20 15:18:41 PDT

+ 2023-04-21 15:59:03 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index dc50f7fd8..ed5fa0421 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-04-20 15:18:41 PDT

+ 2023-04-21 15:59:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 22bac140d..91821d135 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-04-20 15:18:41 PDT

+ 2023-04-21 15:59:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index db84f2e9e..0672c81fe 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-04-20 15:18:40 PDT

+ 2023-04-21 15:59:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 47bf1c04a..9d4a065a2 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-04-20 15:18:39 PDT

+ 2023-04-21 15:59:01 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index dede3cb59..c4811cc98 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-04-20 15:18:40 PDT

+ 2023-04-21 15:59:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index d0eaeccc8..44259dc22 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-04-20 15:18:40 PDT

+ 2023-04-21 15:59:02 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 3022668d3..d1aa1a910 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-04-20 15:18:40 PDT

+ 2023-04-21 15:59:01 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 06c958a3e..daf5421d3 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-04-20 15:18:40 PDT

+ 2023-04-21 15:59:01 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index ed036b845..36fb8bfab 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-04-20 15:18:39 PDT

+ 2023-04-21 15:59:01 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 96380c581..a116c1fa5 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-04-20 15:18:39 PDT

+ 2023-04-21 15:59:01 PDT

 </div>

 </div>

 </body>