diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2010-12-14 10:18:35 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-12-16 13:01:36 -0800 |
| commit | 4a689afb030c1cd5aa1c141db94bbf9dde42f05e (patch) | |
| tree | e6cb1dd0c3149e47f6bc2187a51ade8057cdd35a /Documentation/git-difftool.txt | |
| parent | git-difftool.txt: correct the description of $BASE and describe $MERGED (diff) | |
| download | tgif-4a689afb030c1cd5aa1c141db94bbf9dde42f05e.tar.xz | |
difftool: provide basename to external tools
Currently, only configured diff helpers get the basename of the file
being compared. Tools specified with "git difftool -x" only get the
names of temporary files for the different versions.
Export BASE so that an external tool can read the name from the
environment. Rather than using a third argument, this avoids breaking
existing scripts which may somewhat carelessly be using "$@" rather than
"$1" "$2".
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 498b1610f4..5738432111 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -64,6 +64,7 @@ with custom merge tool commands and has the same value as `$MERGED`. 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:: |