diff options
| -rw-r--r-- | Documentation/git-difftool.txt | 1 | ||||
| -rwxr-xr-x | git-difftool--helper.sh | 1 |
2 files changed, 2 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:: diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 524f5ea8ab..0594bf7ca5 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -49,6 +49,7 @@ launch_merge_tool () { fi if use_ext_cmd; then + export BASE eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"' else run_merge_tool "$merge_tool" |