From 51baceeec4884c14ac8c77902ec6973ab36421ca Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 14 Dec 2010 10:18:34 +0100 Subject: git-difftool.txt: correct the description of $BASE and describe $MERGED Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- Documentation/git-difftool.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 8250bad2c..498b1610f 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -55,8 +55,9 @@ the configured command line will be invoked with the following 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 :: --extcmd=:: -- cgit v1.2.1 From 4a689afb030c1cd5aa1c141db94bbf9dde42f05e Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 14 Dec 2010 10:18:35 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- Documentation/git-difftool.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'Documentation') diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 498b1610f..573843211 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:: -- cgit v1.2.1