Autogenerated HTML docs for v2.37.3-662-g36f8e7e

1 files changed, 32 insertions, 15 deletions

diff --git a/git-difftool.html b/git-difftool.html
index 47f9bfa60..303d7d64c 100644
--- a/git-difftool.html
+++ b/git-difftool.html
@@ -923,17 +923,24 @@ instead.  <code>--no-symlinks</code> is the default on Windows.</p></div>
 </div>

 </div>

 <div class="sect1">

-<h2 id="_config_variables">CONFIG VARIABLES</h2>

+<h2 id="_configuration">CONFIGURATION</h2>

 <div class="sectionbody">

 <div class="paragraph"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the

 difftool equivalents have not been defined.</p></div>

+<div class="paragraph"><p>Everything above this line in this section isn&#8217;t included from the

+<a href="git-config.html">git-config(1)</a> documentation. The content that follows is the

+same as what&#8217;s found there:</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

 diff.tool

 </dt>

 <dd>

 <p>

-        The default diff tool to use.

+        Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.

+        This variable overrides the value configured in <code>merge.tool</code>.

+        The list below shows the valid built-in values.

+        Any other value is treated as a custom diff tool and requires

+        that a corresponding difftool.&lt;tool&gt;.cmd variable is defined.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -941,43 +948,53 @@ diff.guitool
 </dt>

 <dd>

 <p>

-        The default diff tool to use when <code>--gui</code> is specified.

+        Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a> when

+        the -g/--gui flag is specified. This variable overrides the value

+        configured in <code>merge.guitool</code>. The list below shows the valid

+        built-in values. Any other value is treated as a custom diff tool

+        and requires that a corresponding difftool.&lt;guitool&gt;.cmd variable

+        is defined.

 </p>

 </dd>

 <dt class="hdlist1">

-difftool.&lt;tool&gt;.path

+difftool.&lt;tool&gt;.cmd

 </dt>

 <dd>

 <p>

-        Override the path for the given tool.  This is useful in case

-        your tool is not in the PATH.

+        Specify the command to invoke the specified diff tool.

+        The specified command is evaluated in shell with the following

+        variables available:  <em>LOCAL</em> is set to the name of the temporary

+        file containing the contents of the diff pre-image and <em>REMOTE</em>

+        is set to the name of the temporary file containing the contents

+        of the diff post-image.

 </p>

+<div class="paragraph"><p>See the <code>--tool=&lt;tool&gt;</code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>

 </dd>

 <dt class="hdlist1">

-difftool.&lt;tool&gt;.cmd

+difftool.&lt;tool&gt;.path

 </dt>

 <dd>

 <p>

-        Specify the command to invoke the specified diff tool.

+        Override the path for the given tool.  This is useful in case

+        your tool is not in the PATH.

 </p>

-<div class="paragraph"><p>See the <code>--tool=&lt;tool&gt;</code> option above for more details.</p></div>

 </dd>

 <dt class="hdlist1">

-difftool.prompt

+difftool.trustExitCode

 </dt>

 <dd>

 <p>

-        Prompt before each invocation of the diff tool.

+        Exit difftool if the invoked diff tool returns a non-zero exit status.

 </p>

+<div class="paragraph"><p>See the <code>--trust-exit-code</code> option in <a href="git-difftool.html">git-difftool(1)</a> for more details.</p></div>

 </dd>

 <dt class="hdlist1">

-difftool.trustExitCode

+difftool.prompt

 </dt>

 <dd>

 <p>

-        Exit difftool if the invoked diff tool returns a non-zero exit status.

+        Prompt before each invocation of the diff tool.

 </p>

-<div class="paragraph"><p>See the <code>--trust-exit-code</code> option above for more details.</p></div>

 </dd>

 </dl></div>

 </div>

@@ -1024,7 +1041,7 @@ difftool.trustExitCode
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2021-02-26 23:35:19 PST

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

 </div>

 </div>

 </body>