author | Junio C Hamano <gitster@pobox.com> | |
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 17 Dec 2010 00:36:03 +0000 (16:36 -0800) |
* maint:
difftool: provide basename to external tools
git-difftool.txt: correct the description of $BASE and describe $MERGED
difftool: provide basename to external tools
git-difftool.txt: correct the description of $BASE and describe $MERGED
Documentation/git-difftool.txt | patch | blob | history | |
git-difftool--helper.sh | patch | blob | history |
index 6fffbc7bf89d01b14505c03993de9d97d37e9404..db87f1d42382e32d7e3ee94e5c3d0a032b7430e2 100644 (file)
variables available: `$LOCAL` is set to the name of the temporary
file containing the contents of the diff pre-image and `$REMOTE`
is set to the name of the temporary file containing the contents
-of the diff post-image. `$BASE` is provided for compatibility
-with custom merge tool commands and has the same value as `$LOCAL`.
+of the diff post-image. `$MERGED` is the name of the file which is
+being compared. `$BASE` is provided for compatibility
+with custom merge tool commands and has the same value as `$MERGED`.
-x <command>::
--extcmd=<command>::
Specify a custom command for viewing diffs.
'git-difftool' ignores the configured defaults and runs
`$command $LOCAL $REMOTE` when this option is specified.
+ Additionally, `$BASE` is set in the environment.
-g::
--gui::
index 524f5ea8ab14bb44e5a8e6393e40c0ec5c1ddaa2..0594bf7ca54c6b91d5f96dd86d8962e93459d004 100755 (executable)
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
fi
if use_ext_cmd; then
+ export BASE
eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
else
run_merge_tool "$merge_tool"