Autogenerated HTML docs for v2.40.0-352-g667fc

24 files changed, 111 insertions, 37 deletions

diff --git a/MyFirstContribution.html b/MyFirstContribution.html
index 64c976ee6..092568eec 100644
--- a/MyFirstContribution.html
+++ b/MyFirstContribution.html
@@ -1884,7 +1884,7 @@ and your range-diff will be prefaced with "Range-diff against v1".</p></div>
 directory, alongside the v1 patches. Using a single directory makes it easy to

 refer to the old v1 patches while proofreading the v2 patches, but you will need

 to be careful to send out only the v2 patches. We will use a pattern like

-"psuh/v2-<strong>.patch" (not "psuh/</strong>.patch", which would match v1 and v2 patches).</p></div>

+<code>psuh/v2-*.patch</code> (not <code>psuh/*.patch</code>, which would match v1 and v2 patches).</p></div>

 <div class="paragraph"><p>Edit your cover letter again. Now is a good time to mention what&#8217;s different

 between your last version and now, if it&#8217;s something significant. You do not

 need the exact same body in your second cover letter; focus on explaining to

@@ -2060,7 +2060,7 @@ should generate your diffs from <code>&lt;topic&gt;..&lt;mybranch&gt;</code> and
 <div id="footer">

 <div id="footer-text">

 Last updated

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

+ 2023-04-17 21:53:20 PDT

 </div>

 </div>

 </body>

diff --git a/MyFirstContribution.txt b/MyFirstContribution.txt
index 2f8b7d597..56130e4be 100644
--- a/MyFirstContribution.txt
+++ b/MyFirstContribution.txt
@@ -1164,7 +1164,7 @@ After you run this command, `format-patch` will output the patches to the `psuh/
 directory, alongside the v1 patches. Using a single directory makes it easy to
 refer to the old v1 patches while proofreading the v2 patches, but you will need
 to be careful to send out only the v2 patches. We will use a pattern like
-"psuh/v2-*.patch" (not "psuh/*.patch", which would match v1 and v2 patches).
+`psuh/v2-*.patch` (not `psuh/*.patch`, which would match v1 and v2 patches).
 
 Edit your cover letter again. Now is a good time to mention what's different
 between your last version and now, if it's something significant. You do not
diff --git a/RelNotes/2.41.0.txt b/RelNotes/2.41.0.txt
index 0fc82a83f..576762319 100644
--- a/RelNotes/2.41.0.txt
+++ b/RelNotes/2.41.0.txt
@@ -50,6 +50,17 @@ UI, Workflows & Features
    choice of the hash algorithm from the source repository to the
    newly created repository.
 
+ * "git mergetool" and "git difftool" learns a new configuration
+   guiDefault to optionally favor configured guitool over non-gui-tool
+   automatically when $DISPLAY is set.
+
+ * "git branch -d origin/master" would say "no such branch", but it is
+   likely a missed "-r" if refs/remotes/origin/master exists.  The
+   command has been taught to give such a hint in its error message.
+
+ * Clean-up of the code path that deals with merge strategy option
+   handling in "git rebase".
+
 
 Performance, Internal Implementation, Development Support etc.
 
@@ -88,6 +99,9 @@ Performance, Internal Implementation, Development Support etc.
  * "git sparse-checkout" command learns a debugging aid for the sparse
    rule definitions.
 
+ * "git write-tree" learns to work better with sparse-index.
+
+
 
 Fixes since v2.40
 -----------------
@@ -193,6 +207,12 @@ Fixes since v2.40
    /usr/bin/perl, which have been corrected.
    (merge c1917156a0 jk/use-perl-path-consistently later to maint).
 
+ * Documentation mark-up fix.
+   (merge 78b6369e67 la/mfc-markup-fix later to maint).
+
+ * Doc toolchain update to remove old workaround for AsciiDoc.
+   (merge 8806120de6 fc/remove-header-workarounds-for-asciidoc 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-config.html b/git-config.html
index 5b66fef78..95b9f19eb 100644
--- a/git-config.html
+++ b/git-config.html
@@ -5326,6 +5326,18 @@ difftool.prompt
 </p>

 </dd>

 <dt class="hdlist1">

+difftool.guiDefault

+</dt>

+<dd>

+<p>

+        Set <code>true</code> to use the <code>diff.guitool</code> by default (equivalent to specifying

+        the <code>--gui</code> argument), or <code>auto</code> to select <code>diff.guitool</code> or <code>diff.tool</code>

+        depending on the presence of a <code>DISPLAY</code> environment variable value. The

+        default is <code>false</code>, where the <code>--gui</code> argument must be provided

+        explicitly for the <code>diff.guitool</code> to be used.

+</p>

+</dd>

+<dt class="hdlist1">

 extensions.objectFormat

 </dt>

 <dd>

@@ -8732,6 +8744,18 @@ mergetool.prompt
 </p>

 </dd>

 <dt class="hdlist1">

+mergetool.guiDefault

+</dt>

+<dd>

+<p>

+        Set <code>true</code> to use the <code>merge.guitool</code> by default (equivalent to

+        specifying the <code>--gui</code> argument), or <code>auto</code> to select <code>merge.guitool</code>

+        or <code>merge.tool</code> depending on the presence of a <code>DISPLAY</code> environment

+        variable value. The default is <code>false</code>, where the <code>--gui</code> argument

+        must be provided explicitly for the <code>merge.guitool</code> to be used.

+</p>

+</dd>

+<dt class="hdlist1">

 notes.mergeStrategy

 </dt>

 <dd>

diff --git a/git-difftool.html b/git-difftool.html
index 303d7d64c..6f904f826 100644
--- a/git-difftool.html
+++ b/git-difftool.html
@@ -899,10 +899,12 @@ instead.  <code>--no-symlinks</code> is the default on Windows.</p></div>
 <p>

         When <em>git-difftool</em> is invoked with the <code>-g</code> or <code>--gui</code> option

         the default diff tool will be read from the configured

-        <code>diff.guitool</code> variable instead of <code>diff.tool</code>. The <code>--no-gui</code>

-        option can be used to override this setting. If <code>diff.guitool</code>

-        is not set, we will fallback in the order of <code>merge.guitool</code>,

-        <code>diff.tool</code>, <code>merge.tool</code> until a tool is found.

+        <code>diff.guitool</code> variable instead of <code>diff.tool</code>. This may be

+        selected automatically using the configuration variable

+        <code>difftool.guiDefault</code>. The <code>--no-gui</code> option can be used to

+        override these settings. If <code>diff.guitool</code> is not set, we will

+        fallback in the order of <code>merge.guitool</code>, <code>diff.tool</code>,

+        <code>merge.tool</code> until a tool is found.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -996,6 +998,18 @@ difftool.prompt
         Prompt before each invocation of the diff tool.

 </p>

 </dd>

+<dt class="hdlist1">

+difftool.guiDefault

+</dt>

+<dd>

+<p>

+        Set <code>true</code> to use the <code>diff.guitool</code> by default (equivalent to specifying

+        the <code>--gui</code> argument), or <code>auto</code> to select <code>diff.guitool</code> or <code>diff.tool</code>

+        depending on the presence of a <code>DISPLAY</code> environment variable value. The

+        default is <code>false</code>, where the <code>--gui</code> argument must be provided

+        explicitly for the <code>diff.guitool</code> to be used.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1041,7 +1055,7 @@ difftool.prompt
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-09-14 13:23:11 PDT

+ 2023-04-17 21:53:20 PDT

 </div>

 </div>

 </body>

diff --git a/git-difftool.txt b/git-difftool.txt
index 9d14c3c9f..ac0ac6fa0 100644
--- a/git-difftool.txt
+++ b/git-difftool.txt
@@ -97,10 +97,12 @@ instead.  `--no-symlinks` is the default on Windows.
 --[no-]gui::
 	When 'git-difftool' is invoked with the `-g` or `--gui` option
 	the default diff tool will be read from the configured
-	`diff.guitool` variable instead of `diff.tool`. The `--no-gui`
-	option can be used to override this setting. If `diff.guitool`
-	is not set, we will fallback in the order of `merge.guitool`,
-	`diff.tool`, `merge.tool` until a tool is found.
+	`diff.guitool` variable instead of `diff.tool`. This may be
+	selected automatically using the configuration variable
+	`difftool.guiDefault`. The `--no-gui` option can be used to
+	override these settings. If `diff.guitool` is not set, we will
+	fallback in the order of `merge.guitool`, `diff.tool`,
+	`merge.tool` until a tool is found.
 
 --[no-]trust-exit-code::
 	'git-difftool' invokes a diff tool individually on each file.
diff --git a/git-mergetool.html b/git-mergetool.html
index dc6726b54..9967ccc19 100644
--- a/git-mergetool.html
+++ b/git-mergetool.html
@@ -856,7 +856,8 @@ success of the resolution after the custom tool has exited.</p></div>
         the default merge tool will be read from the configured

         <code>merge.guitool</code> variable instead of <code>merge.tool</code>. If

         <code>merge.guitool</code> is not set, we will fallback to the tool

-        configured under <code>merge.tool</code>.

+        configured under <code>merge.tool</code>. This may be autoselected using

+        the configuration variable <code>mergetool.guiDefault</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -864,9 +865,9 @@ success of the resolution after the custom tool has exited.</p></div>
 </dt>

 <dd>

 <p>

-        This overrides a previous <code>-g</code> or <code>--gui</code> setting and reads the

-        default merge tool will be read from the configured <code>merge.tool</code>

-        variable.

+        This overrides a previous <code>-g</code> or <code>--gui</code> setting or

+        <code>mergetool.guiDefault</code> configuration and reads the default merge

+        tool from the configured <code>merge.tool</code> variable.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1036,6 +1037,18 @@ mergetool.prompt
         Prompt before each invocation of the merge resolution program.

 </p>

 </dd>

+<dt class="hdlist1">

+mergetool.guiDefault

+</dt>

+<dd>

+<p>

+        Set <code>true</code> to use the <code>merge.guitool</code> by default (equivalent to

+        specifying the <code>--gui</code> argument), or <code>auto</code> to select <code>merge.guitool</code>

+        or <code>merge.tool</code> depending on the presence of a <code>DISPLAY</code> environment

+        variable value. The default is <code>false</code>, where the <code>--gui</code> argument

+        must be provided explicitly for the <code>merge.guitool</code> to be used.

+</p>

+</dd>

 </dl></div>

 </div>

 </div>

@@ -1329,7 +1342,7 @@ MERGED and REMOTE).</p></div>
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2022-09-14 13:23:11 PDT

+ 2023-04-17 21:53:20 PDT

 </div>

 </div>

 </body>

diff --git a/git-mergetool.txt b/git-mergetool.txt
index c44e20562..07535f657 100644
--- a/git-mergetool.txt
+++ b/git-mergetool.txt
@@ -85,12 +85,13 @@ success of the resolution after the custom tool has exited.
 	the default merge tool will be read from the configured
 	`merge.guitool` variable instead of `merge.tool`. If
 	`merge.guitool` is not set, we will fallback to the tool
-	configured under `merge.tool`.
+	configured under `merge.tool`. This may be autoselected using
+	the configuration variable `mergetool.guiDefault`.
 
 --no-gui::
-	This overrides a previous `-g` or `--gui` setting and reads the
-	default merge tool will be read from the configured `merge.tool`
-	variable.
+	This overrides a previous `-g` or `--gui` setting or
+	`mergetool.guiDefault` configuration and reads the default merge
+	tool from the configured `merge.tool` variable.
 
 -O<orderfile>::
 	Process files in the order specified in the
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html
index f04afa13d..c55310d30 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-11 13:52:10 PDT

+ 2023-04-17 21:53:57 PDT

 </div>

 </div>

 </body>

diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html
index a540ba8f4..28467beb4 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-11 13:52:09 PDT

+ 2023-04-17 21:53:57 PDT

 </div>

 </div>

 </body>

diff --git a/howto/maintain-git.html b/howto/maintain-git.html
index 6b2b77be6..78d524935 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-11 13:52:10 PDT

+ 2023-04-17 21:53:57 PDT

 </div>

 </div>

 </body>

diff --git a/howto/new-command.html b/howto/new-command.html
index b5af77914..90c9280a8 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-11 13:52:07 PDT

+ 2023-04-17 21:53:55 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html
index 1dfe7c51d..18397aa71 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-11 13:52:09 PDT

+ 2023-04-17 21:53:57 PDT

 </div>

 </div>

 </body>

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html
index fd3e71419..67386b582 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-11 13:52:09 PDT

+ 2023-04-17 21:53:57 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html
index e4f2079c2..9d6777ef0 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-11 13:52:09 PDT

+ 2023-04-17 21:53:57 PDT

 </div>

 </div>

 </body>

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html
index 204e2da38..95e2342a9 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-11 13:52:09 PDT

+ 2023-04-17 21:53:57 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html
index 6abae4400..c99193748 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-11 13:52:09 PDT

+ 2023-04-17 21:53:56 PDT

 </div>

 </div>

 </body>

diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html
index d9406f89b..3fc03d9ac 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-11 13:52:07 PDT

+ 2023-04-17 21:53:55 PDT

 </div>

 </div>

 </body>

diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html
index a3b877c03..a32650b33 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-11 13:52:09 PDT

+ 2023-04-17 21:53:56 PDT

 </div>

 </div>

 </body>

diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html
index 4e3cbe4d6..0cd392043 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-11 13:52:08 PDT

+ 2023-04-17 21:53:56 PDT

 </div>

 </div>

 </body>

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html
index cbc39ec16..7487c8929 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-11 13:52:08 PDT

+ 2023-04-17 21:53:56 PDT

 </div>

 </div>

 </body>

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html
index 14833b89e..ee1a7a2e1 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-11 13:52:08 PDT

+ 2023-04-17 21:53:56 PDT

 </div>

 </div>

 </body>

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html
index 67cf9f28f..3ac236c64 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-11 13:52:07 PDT

+ 2023-04-17 21:53:55 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 0a095d81c..bde46e659 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-11 13:52:08 PDT

+ 2023-04-17 21:53:55 PDT

 </div>

 </div>

 </body>