diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-01-21 00:42:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-01-21 00:42:16 +0000 |
| commit | a9701f0184382d8de7380c56558718915905746a (patch) | |
| tree | 25620bdfe6b5a66edecbbd6153f50dc5cb1e88f9 /git-difftool.html | |
| parent | 19107ef38294e3b64a70b32302416dd52c0e779a (diff) | |
| download | git-htmldocs-a9701f0184382d8de7380c56558718915905746a.tar.gz | |
Autogenerated HTML docs for v1.6.6.1-336-g19c6
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/git-difftool.html b/git-difftool.html index 4e6833e07..e8cf5bc53 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -320,7 +320,7 @@ git-difftool(1) Manual Page </div>
<h2>SYNOPSIS</h2>
<div class="sectionbody">
-<div class="para"><p><em>git difftool</em> [--tool=<tool>] [-y|--no-prompt|--prompt] [<<em>git diff</em> options>]</p></div>
+<div class="para"><p><em>git difftool</em> [<options>] <commit>{0,2} [--] [<path>…]</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
@@ -387,6 +387,32 @@ is set to the name of the temporary file containing the contents of the diff post-image. <tt>$BASE</tt> is provided for compatibility
with custom merge tool commands and has the same value as <tt>$LOCAL</tt>.</p></div>
</dd>
+<dt>
+-x <command>
+</dt>
+<dt>
+--extcmd=<command>
+</dt>
+<dd>
+<p>
+ Specify a custom command for viewing diffs.
+ <em>git-difftool</em> ignores the configured defaults and runs
+ <tt>$command $LOCAL $REMOTE</tt> when this option is specified.
+</p>
+</dd>
+<dt>
+-g
+</dt>
+<dt>
+--gui
+</dt>
+<dd>
+<p>
+ When <em>git-difftool</em> is invoked with the <tt>-g</tt> or <tt>--gui</tt> option
+ the default diff tool will be read from the configured
+ <tt>diff.guitool</tt> variable instead of <tt>diff.tool</tt>.
+</p>
+</dd>
</dl></div>
<div class="para"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
</div>
@@ -404,6 +430,14 @@ diff.tool </p>
</dd>
<dt>
+diff.guitool
+</dt>
+<dd>
+<p>
+ The default diff tool to use when <tt>--gui</tt> is specified.
+</p>
+</dd>
+<dt>
difftool.<tool>.path
</dt>
<dd>
@@ -474,7 +508,7 @@ difftool.prompt </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:33 UTC
+Last updated 2010-01-21 00:41:36 UTC
</div>
</div>
</body>
|