diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-15 15:18:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-15 15:18:15 -0800 |
| commit | e89102f576e57803186bcbec0507e49885224867 (patch) | |
| tree | a7eb6c85dec2bba8a08ee969b5013ca92485a198 /git-difftool.html | |
| parent | a8e4261bd5f84cbc59a4a12a7908561671210aba (diff) | |
| download | git-htmldocs-e89102f576e57803186bcbec0507e49885224867.tar.gz | |
Autogenerated HTML docs for v2.12.0-rc1-28-gd09b6
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-difftool.html b/git-difftool.html index c9aab8a83..9a3392726 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -874,13 +874,14 @@ instead. <code>--no-symlinks</code> is the default on Windows.</p></div> -g
</dt>
<dt class="hdlist1">
---gui
+--[no-]gui
</dt>
<dd>
<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>.
+ <code>diff.guitool</code> variable instead of <code>diff.tool</code>. The <code>--no-gui</code>
+ option can be used to override this setting.
</p>
</dd>
<dt class="hdlist1">
@@ -1001,7 +1002,7 @@ difftool.trustExitCode <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-07-13 14:58:50 PDT
+Last updated 2017-02-15 15:17:51 PST
</div>
</div>
</body>
|