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