Autogenerated HTML docs for v2.39.0-56-g57e2c

21 files changed, 99 insertions, 20 deletions

diff --git a/RelNotes/2.40.0.txt b/RelNotes/2.40.0.txt
new file mode 100644
index 000000000..669a03518
--- /dev/null
+++ b/RelNotes/2.40.0.txt
@@ -0,0 +1,37 @@
+Git v2.40 Release Notes
+=======================
+
+UI, Workflows & Features
+
+ * "merge-tree" learns a new `--merge-base` option.
+
+ * "git jump" (in contrib/) learned to present the "quickfix list" to
+   its standard output (instead of letting it consumed by the editor
+   it invokes), and learned to also drive emacs/emacsclient.
+
+ * "git var UNKNOWN_VARIABLE" and "git var VARIABLE" with the variable
+   given an empty value used to behave identically.  Now the latter
+   just gives an empty output, while the former still gives an error
+   message.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * `git bisect` becomes a builtin.
+
+ * The pack-bitmap machinery is taught to log the paths of redundant
+   bitmap(s) to trace2 instead of stderr.
+
+
+
+Fixes since v2.39
+-----------------
+
+ * Various leak fixes.
+   (merge ac95f5d36a ab/various-leak-fixes later to maint).
+
+ * Fix a bug where `pack-objects` would not respect multiple `--filter`
+   arguments when invoked directly.
+   (merge d4f7036887 rs/multi-filter-args later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
diff --git a/git-merge-tree.html b/git-merge-tree.html
index f729e2c94..125723973 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -846,6 +846,16 @@ etc.
         check and make the merge proceed anyway.

 </p>

 </dd>

+<dt class="hdlist1">

+--merge-base=&lt;commit&gt;

+</dt>

+<dd>

+<p>

+        Instead of finding the merge-bases for &lt;branch1&gt; and &lt;branch2&gt;,

+        specify a merge-base for the merge, and specifying multiple bases is

+        currently not supported. This option is incompatible with <code>--stdin</code>.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1046,6 +1056,20 @@ any messages that would have been printed to stdout (the
 </div>

 </div>

 <div class="sect1">

+<h2 id="_input_format">INPUT FORMAT</h2>

+<div class="sectionbody">

+<div class="paragraph"><p><em>git merge-tree --stdin</em> input format is fully text based. Each line

+has this format:</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>[&lt;base-commit&gt; -- ]&lt;branch1&gt; &lt;branch2&gt;</code></pre>

+</div></div>

+<div class="paragraph"><p>If one line is separated by <code>--</code>, the string before the separator is

+used for specifying a merge-base for the merge and the string after

+the separator describes the branches to be merged.</p></div>

+</div>

+</div>

+<div class="sect1">

 <h2 id="_mistakes_to_avoid">MISTAKES TO AVOID</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>Do NOT look through the resulting toplevel tree to try to find which

@@ -1128,7 +1152,7 @@ large repositories).</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-11-05 13:49:36 JST

+ 2022-12-14 18:45:42 JST

 </div>

 </div>

 </body>

diff --git a/git-merge-tree.txt b/git-merge-tree.txt
index 04bcc416e..88ee94210 100644
--- a/git-merge-tree.txt
+++ b/git-merge-tree.txt
@@ -64,6 +64,11 @@ OPTIONS
 	share no common history.  This flag can be given to override that
 	check and make the merge proceed anyway.
 
+--merge-base=<commit>::
+	Instead of finding the merge-bases for <branch1> and <branch2>,
+	specify a merge-base for the merge, and specifying multiple bases is
+	currently not supported. This option is incompatible with `--stdin`.
+
 [[OUTPUT]]
 OUTPUT
 ------
@@ -216,6 +221,17 @@ with linkgit:git-merge[1]:
   * any messages that would have been printed to stdout (the
     <<IM,Informational messages>>)
 
+INPUT FORMAT
+------------
+'git merge-tree --stdin' input format is fully text based. Each line
+has this format:
+
+	[<base-commit> -- ]<branch1> <branch2>
+
+If one line is separated by `--`, the string before the separator is
+used for specifying a merge-base for the merge and the string after
+the separator describes the branches to be merged.
+
 MISTAKES TO AVOID
 -----------------
 
diff --git a/git-var.html b/git-var.html
index f7e1c3d1c..1a73d5405 100644
--- a/git-var.html
+++ b/git-var.html
@@ -757,7 +757,8 @@ git-var(1) Manual Page
 <div class="sect1">

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

 <div class="sectionbody">

-<div class="paragraph"><p>Prints a Git logical variable.</p></div>

+<div class="paragraph"><p>Prints a Git logical variable. Exits with code 1 if the variable has

+no value.</p></div>

 </div>

 </div>

 <div class="sect1">

@@ -864,7 +865,7 @@ GIT_DEFAULT_BRANCH
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-10-29 03:53:56 JST

+ 2022-12-14 18:45:42 JST

 </div>

 </div>

 </body>

diff --git a/git-var.txt b/git-var.txt
index 6aa521fab..0ab5bfa7d 100644
--- a/git-var.txt
+++ b/git-var.txt
@@ -13,7 +13,8 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Prints a Git logical variable.
+Prints a Git logical variable. Exits with code 1 if the variable has
+no value.
 
 OPTIONS
 -------
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index b41868a52..a6e08fac6 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

- 2022-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 868d1f3cb..d7555eb30 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-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index bd8dc4196..42b715b88 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

- 2022-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index b51e2bc04..50206bca0 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-12-12 10:25:32 JST

+ 2022-12-14 18:46:17 JST

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index d9cc72943..cc8a0c659 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-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index a6a80bc36..189a75add 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-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 7c64fa654..606d9b515 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-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 8c8df907e..c1fba2579 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-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index a3328a5d8..5a42f9f49 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-12-12 10:25:34 JST

+ 2022-12-14 18:46:19 JST

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 07fe2a95a..bc5ea189b 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-12-12 10:25:32 JST

+ 2022-12-14 18:46:17 JST

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 42abe9c77..e95981993 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-12-12 10:25:34 JST

+ 2022-12-14 18:46:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index fbc0c51bc..079f419ea 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-12-12 10:25:33 JST

+ 2022-12-14 18:46:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index c8938bf64..d041d166c 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-12-12 10:25:33 JST

+ 2022-12-14 18:46:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 940c6ca6e..b3fbfe22a 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-12-12 10:25:33 JST

+ 2022-12-14 18:46:18 JST

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 0febbf7a4..c804d306a 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-12-12 10:25:33 JST

+ 2022-12-14 18:46:17 JST

 </div>

 </div>

 </body>

diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html
index 7dc0171c1..2264c164b 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-12-12 10:25:33 JST

+ 2022-12-14 18:46:18 JST

 </div>

 </div>

 </body>