diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-10 11:45:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-10 11:45:15 -0700 |
| commit | bcdb12ed43f108ca2931dda48a9b772cd4efb5f5 (patch) | |
| tree | 5d6ea9a34c1a16b30b3a50d9538df86a4b92908b /git-difftool.html | |
| parent | 22700fb0070b260261fc5003205fe9aa9e080ce5 (diff) | |
| download | git-htmldocs-bcdb12ed43f108ca2931dda48a9b772cd4efb5f5.tar.gz | |
Autogenerated HTML docs for v1.7.10.1-553-gb7fbc
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/git-difftool.html b/git-difftool.html index 26b8dc79e..cb393244a 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -598,6 +598,19 @@ to <em>git diff</em> and accepts the same options and arguments. See <div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
+-d
+</dt>
+<dt class="hdlist1">
+--dir-diff
+</dt>
+<dd>
+<p>
+ Copy the modified files to a temporary location and perform
+ a directory diff on them. This mode never prompts before
+ launching the diff tool.
+</p>
+</dd>
+<dt class="hdlist1">
-y
</dt>
<dt class="hdlist1">
@@ -626,11 +639,9 @@ to <em>git diff</em> and accepts the same options and arguments. See </dt>
<dd>
<p>
- Use the diff tool specified by <tool>.
- Valid diff tools are:
- araxis, bc3, deltawalker, diffuse, emerge, ecmerge, gvimdiff,
- kdiff3, kompare, meld, opendiff, p4merge, tkdiff, vimdiff and
- xxdiff.
+ Use the diff tool specified by <tool>. Valid values include
+ emerge, kompare, meld, and vimdiff. Run <tt>git difftool --tool-help</tt>
+ for the list of valid <tool> settings.
</p>
<div class="paragraph"><p>If a diff tool is not specified, <em>git difftool</em>
will use the configuration variable <tt>diff.tool</tt>. If the
@@ -656,6 +667,14 @@ being compared. <tt>$BASE</tt> is provided for compatibility with custom merge tool commands and has the same value as <tt>$MERGED</tt>.</p></div>
</dd>
<dt class="hdlist1">
+--tool-help
+</dt>
+<dd>
+<p>
+ Print a list of diff tools that may be used with <tt>--tool</tt>.
+</p>
+</dd>
+<dt class="hdlist1">
-x <command>
</dt>
<dt class="hdlist1">
@@ -771,7 +790,7 @@ difftool.prompt <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-03-16 11:50:29 PDT
+Last updated 2012-05-10 11:44:38 PDT
</div>
</div>
</body>
|