diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-12-17 06:57:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-12-17 06:57:26 +0000 |
| commit | 0d75e8734ce2601a438c17a0588270dd3fa8aec1 (patch) | |
| tree | 363735b98fcf0a14a4451e68f99fa405ec4e4014 /git-difftool.html | |
| parent | 7eeb87e0c2c984b2f0f5797c572f8e3661438005 (diff) | |
| download | git-htmldocs-0d75e8734ce2601a438c17a0588270dd3fa8aec1.tar.gz | |
Autogenerated HTML docs for v1.7.3.4-568-g1b974
Diffstat (limited to 'git-difftool.html')
| -rw-r--r-- | git-difftool.html | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/git-difftool.html b/git-difftool.html index 7e44f1d06..4f3f562cb 100644 --- a/git-difftool.html +++ b/git-difftool.html @@ -479,8 +479,9 @@ the configured command line will be invoked with the following variables available: <tt>$LOCAL</tt> is set to the name of the temporary
file containing the contents of the diff pre-image and <tt>$REMOTE</tt>
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>
+of the diff post-image. <tt>$MERGED</tt> is the name of the file which is
+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">
-x <command>
@@ -493,6 +494,7 @@ with custom merge tool commands and has the same value as <tt>$LOCAL</tt>.</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.
+ Additionally, <tt>$BASE</tt> is set in the environment.
</p>
</dd>
<dt class="hdlist1">
@@ -603,7 +605,7 @@ difftool.prompt </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-12-05 06:20:21 UTC
+Last updated 2010-12-17 06:56:34 UTC
</div>
</div>
</body>
|