1 files changed, 24 insertions, 0 deletions
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>