1 files changed, 18 insertions, 5 deletions
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>