Autogenerated HTML docs for v2.40.0-115-ge25ca

22 files changed, 92 insertions, 70 deletions

diff --git a/RelNotes/2.41.0.txt b/RelNotes/2.41.0.txt
index 71c9342aa..d6095a5df 100644
--- a/RelNotes/2.41.0.txt
+++ b/RelNotes/2.41.0.txt
@@ -11,6 +11,22 @@ UI, Workflows & Features
    checking object connectivity, most useful when there are many
    unrelated histories in a single repository.
 
+ * "git push" has been taught to allow deletion of refs with one-level
+   names to help repairing a repository who acquired such a ref by
+   mistake.  In general, we don't encourage use of such a ref, and
+   creation or update to such a ref is rejected as before.
+
+ * Allow "git bisect reset" to check out the original branch when the
+   branch is already checked out in a different worktree linked to the
+   same repository.
+
+ * A few subcommands have been taught to stop users from working on a
+   branch that is being used in another worktree linked to the same
+   repository.
+
+ * "git format-patch" learned to write a log-message only output file
+   for empty commits.
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -33,4 +49,40 @@ Fixes since v2.40
    just like "git gc" honors them as anchoring points.
    (merge 8d3e7eac52 jk/fsck-indices-in-worktrees later to maint).
 
+ * Fix a segfaulting loop.  The function and its caller may need
+   further clean-up.
+   (merge c5773dc078 ew/commit-reach-clean-up-flags-fix later to maint).
+
+ * "git restore" supports options like "--ours" that are only
+   meaningful during a conflicted merge, but these options are only
+   meaningful when updating the working tree files.  These options are
+   marked to be incompatible when both "--staged" and "--worktree" are
+   in effect.
+   (merge ee8a88826a ak/restore-both-incompatible-with-conflicts later to maint).
+
+ * Simplify UI to control progress meter given by "git bundle" command.
+   (merge 8b95521edb jk/bundle-progress later to maint).
+
+ * "git bundle" learned that "-" is a common way to say that the input
+   comes from the standard input and/or the output goes to the
+   standard output.  It used to work only for output and only from the
+   root level of the working tree.
+   (merge 0bbe10313e jk/bundle-use-dash-for-stdfiles later to maint).
+
+ * Once we start running, we assumed that the list of alternate object
+   databases would never change.  Hook into the machinery used to
+   update the list of packfiles during runtime to update this list as
+   well.
+   (merge e2d003dbed ds/reprepare-alternates-when-repreparing-packfiles later to maint).
+
+ * The code to parse "git rebase -X<opt>" was not prepared to see an
+   unparsable option string, which has been corrected.
+   (merge 15a4cc912e ab/fix-strategy-opts-parsing later to maint).
+
+ * "git add -p" while the index is unmerged sometimes failed to parse
+   the diff output it internally produces and died, which has been
+   corrected.
+   (merge 28d1122f9c jk/add-p-unmerged-fix later to maint).
+
  * Other code cleanup, docfix, build fix, etc.
+   (merge f7111175df as/doc-markup-fix later to maint).
diff --git a/git-bundle.html b/git-bundle.html
index 21ebd6c89..2c870b953 100644
--- a/git-bundle.html
+++ b/git-bundle.html
@@ -749,7 +749,7 @@ git-bundle(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>

 <div class="sectionbody">

 <div class="verseblock">

-<pre class="content"><em>git bundle</em> create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]

+<pre class="content"><em>git bundle</em> create [-q | --quiet | --progress]

                     [--version=&lt;version&gt;] &lt;file&gt; &lt;git-rev-list-args&gt;

 <em>git bundle</em> verify [-q | --quiet] &lt;file&gt;

 <em>git bundle</em> list-heads &lt;file&gt; [&lt;refname&gt;&#8230;]

@@ -809,7 +809,7 @@ create [options] &lt;file&gt; &lt;git-rev-list-args&gt;
         Used to create a bundle named <em>file</em>.  This requires the

         <em>&lt;git-rev-list-args&gt;</em> arguments to define the bundle contents.

         <em>options</em> contains the options specific to the <em>git bundle create</em>

-        subcommand.

+        subcommand. If <em>file</em> is <code>-</code>, the bundle is written to stdout.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -825,7 +825,8 @@ verify &lt;file&gt;
         Finally, information about additional capabilities, such as "object

         filter", is printed. See "Capabilities" in <a href="gitformat-bundle.html">gitformat-bundle(5)</a>

         for more information. The exit code is zero for success, but will

-        be nonzero if the bundle file is invalid.

+        be nonzero if the bundle file is invalid. If <em>file</em> is <code>-</code>, the

+        bundle is read from stdin.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -835,7 +836,7 @@ list-heads &lt;file&gt;
 <p>

         Lists the references defined in the bundle.  If followed by a

         list of references, only references matching those given are

-        printed out.

+        printed out. If <em>file</em> is <code>-</code>, the bundle is read from stdin.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -848,6 +849,7 @@ unbundle &lt;file&gt;
         defined references. If a list of references is given, only

         references matching those in the list are printed. This command is

         really plumbing, intended to be called only by <em>git fetch</em>.

+        If <em>file</em> is <code>-</code>, the bundle is read from stdin.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -889,32 +891,6 @@ unbundle &lt;file&gt;
 </p>

 </dd>

 <dt class="hdlist1">

---all-progress

-</dt>

-<dd>

-<p>

-        When --stdout is specified then progress report is

-        displayed during the object count and compression phases

-        but inhibited during the write-out phase. The reason is

-        that in some cases the output stream is directly linked

-        to another command which may wish to display progress

-        status of its own as it processes incoming pack data.

-        This flag is like --progress except that it forces progress

-        report for the write-out phase as well even if --stdout is

-        used.

-</p>

-</dd>

-<dt class="hdlist1">

---all-progress-implied

-</dt>

-<dd>

-<p>

-        This is used to imply --all-progress whenever progress display

-        is activated.  Unlike --all-progress this flag doesn&#8217;t actually

-        force any progress display by itself.

-</p>

-</dd>

-<dt class="hdlist1">

 --version=&lt;version&gt;

 </dt>

 <dd>

@@ -1128,7 +1104,7 @@ references when fetching:</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-09-15 16:31:06 PDT

+ 2023-03-19 15:16:41 PDT

 </div>

 </div>

 </body>

diff --git a/git-bundle.txt b/git-bundle.txt
index 18a022b4b..3ab42a19c 100644
--- a/git-bundle.txt
+++ b/git-bundle.txt
@@ -9,7 +9,7 @@ git-bundle - Move objects and refs by archive
 SYNOPSIS
 --------
 [verse]
-'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]
+'git bundle' create [-q | --quiet | --progress]
 		    [--version=<version>] <file> <git-rev-list-args>
 'git bundle' verify [-q | --quiet] <file>
 'git bundle' list-heads <file> [<refname>...]
@@ -66,7 +66,7 @@ create [options] <file> <git-rev-list-args>::
 	Used to create a bundle named 'file'.  This requires the
 	'<git-rev-list-args>' arguments to define the bundle contents.
 	'options' contains the options specific to the 'git bundle create'
-	subcommand.
+	subcommand. If 'file' is `-`, the bundle is written to stdout.
 
 verify <file>::
 	Used to check that a bundle file is valid and will apply
@@ -77,12 +77,13 @@ verify <file>::
 	Finally, information about additional capabilities, such as "object
 	filter", is printed. See "Capabilities" in linkgit:gitformat-bundle[5]
 	for more information. The exit code is zero for success, but will
-	be nonzero if the bundle file is invalid.
+	be nonzero if the bundle file is invalid. If 'file' is `-`, the
+	bundle is read from stdin.
 
 list-heads <file>::
 	Lists the references defined in the bundle.  If followed by a
 	list of references, only references matching those given are
-	printed out.
+	printed out. If 'file' is `-`, the bundle is read from stdin.
 
 unbundle <file>::
 	Passes the objects in the bundle to 'git index-pack'
@@ -90,6 +91,7 @@ unbundle <file>::
 	defined references. If a list of references is given, only
 	references matching those in the list are printed. This command is
 	really plumbing, intended to be called only by 'git fetch'.
+	If 'file' is `-`, the bundle is read from stdin.
 
 <git-rev-list-args>::
 	A list of arguments, acceptable to 'git rev-parse' and
@@ -115,22 +117,6 @@ unbundle <file>::
 	is specified. This flag forces progress status even if
 	the standard error stream is not directed to a terminal.
 
---all-progress::
-	When --stdout is specified then progress report is
-	displayed during the object count and compression phases
-	but inhibited during the write-out phase. The reason is
-	that in some cases the output stream is directly linked
-	to another command which may wish to display progress
-	status of its own as it processes incoming pack data.
-	This flag is like --progress except that it forces progress
-	report for the write-out phase as well even if --stdout is
-	used.
-
---all-progress-implied::
-	This is used to imply --all-progress whenever progress display
-	is activated.  Unlike --all-progress this flag doesn't actually
-	force any progress display by itself.
-
 --version=<version>::
 	Specify the bundle version.  Version 2 is the older format and can only be
 	used with SHA-1 repositories; the newer version 3 contains capabilities that
diff --git a/git-config.html b/git-config.html
index 864ac0fff..2fe8acb03 100644
--- a/git-config.html
+++ b/git-config.html
@@ -2320,6 +2320,14 @@ updateSparsePath
                 checkout.

 </p>

 </dd>

+<dt class="hdlist1">

+diverging

+</dt>

+<dd>

+<p>

+                Advice shown when a fast-forward is not possible.

+</p>

+</dd>

 </dl></div>

 </div></div>

 </dd>

diff --git a/git-merge-tree.html b/git-merge-tree.html
index 1a12007d9..9d4a158bd 100644
--- a/git-merge-tree.html
+++ b/git-merge-tree.html
@@ -898,7 +898,7 @@ NUL</code></pre>
 <div class="content">

 <pre><code>0: merge had conflicts

 1: merge was clean

-&amp;lt;0: something prevented the merge from running (e.g. access to repository

+&lt;0: something prevented the merge from running (e.g. access to repository

     objects denied by filesystem)</code></pre>

 </div></div>

 </div>

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

 <div id="footer-text">

 Last updated

- 2022-12-14 01:45:42 PST

+ 2023-03-19 15:16:41 PDT

 </div>

 </div>

 </body>

diff --git a/git-merge-tree.txt b/git-merge-tree.txt
index 88ee94210..ffc4fbf7e 100644
--- a/git-merge-tree.txt
+++ b/git-merge-tree.txt
@@ -108,7 +108,7 @@ This is an integer status followed by a NUL character.  The integer status is:
 
      0: merge had conflicts
      1: merge was clean
-     &lt;0: something prevented the merge from running (e.g. access to repository
+     <0: something prevented the merge from running (e.g. access to repository
 	 objects denied by filesystem)
 
 [[OIDTLT]]
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index 339d0f151..f90bbf109 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-17 14:33:51 PDT

+ 2023-03-19 15:17:29 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index 3bbe486af..2bb712cbc 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-17 14:33:51 PDT

+ 2023-03-19 15:17:29 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 2e2877b1c..a221efb92 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-17 14:33:51 PDT

+ 2023-03-19 15:17:29 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index 0a57896d8..9698ff16f 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-17 14:33:46 PDT

+ 2023-03-19 15:17:26 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 9f2ad5219..380b4463f 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-17 14:33:51 PDT

+ 2023-03-19 15:17:28 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index 4722d7b1e..976b4f3d2 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-17 14:33:51 PDT

+ 2023-03-19 15:17:28 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index 614b658bb..5009acde6 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-17 14:33:50 PDT

+ 2023-03-19 15:17:28 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index e2f4ee1b9..f7f2cf887 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-17 14:33:50 PDT

+ 2023-03-19 15:17:28 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 98d7e0187..4282130f3 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-17 14:33:49 PDT

+ 2023-03-19 15:17:28 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index 9ec7d74b1..364beb03d 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-17 14:33:46 PDT

+ 2023-03-19 15:17:27 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index 006788ae0..7606719f0 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-17 14:33:49 PDT

+ 2023-03-19 15:17:28 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 3367ebd85..2726038f9 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-17 14:33:48 PDT

+ 2023-03-19 15:17:27 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index 865314165..15631e406 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-17 14:33:48 PDT

+ 2023-03-19 15:17:27 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 857bf5f6c..86789e921 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-17 14:33:48 PDT

+ 2023-03-19 15:17:27 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index ade144d42..f358fc160 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-17 14:33:47 PDT

+ 2023-03-19 15:17:27 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 1dcd1ee29..8ce73f0f5 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-17 14:33:47 PDT

+ 2023-03-19 15:17:27 PDT

 </div>

 </div>

 </body>