diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-19 18:01:19 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 18:01:19 +0900 |
| commit | 56d696ee5be4d6ce871726df6e396c76eedcccf0 (patch) | |
| tree | 5fdbf981967be28ae958f476b0b6d9b4343fd146 /git-difftool.html | |
| parent | 792b6092433e1d94ae2e4b9e83a333bf2d0425a2 (diff) | |
| download | git-htmldocs-56d696ee5be4d6ce871726df6e396c76eedcccf0.tar.gz | |
Autogenerated HTML docs for v2.22.0-rc1
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-difftool.html b/git-difftool.html index 096026d3b..7710b4f57 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -882,7 +882,9 @@ instead. <code>--no-symlinks</code> is the default on Windows.</p></div> 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.
+ 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.
</p>
</dd>
<dt class="hdlist1">
@@ -1004,7 +1006,7 @@ difftool.trustExitCode <div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2019-05-19 17:58:26 JST
</div>
</div>
</body>
|