diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-16 16:36:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-16 16:36:03 -0800 |
| commit | 38a5932be8a8f0b0bd3bb949bdc5258d9c753f15 (patch) | |
| tree | 988476312dea85d849b00b42b812f626bd7dbf29 /Documentation/git-difftool.txt | |
| parent | cf7a64b54afe28ff61b362abc04399de383977e0 (diff) | |
| parent | 4a689afb030c1cd5aa1c141db94bbf9dde42f05e (diff) | |
| download | git-38a5932be8a8f0b0bd3bb949bdc5258d9c753f15.tar.gz | |
Merge branch 'maint'
* maint:
difftool: provide basename to external tools
git-difftool.txt: correct the description of $BASE and describe $MERGED
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 6fffbc7bf8..db87f1d423 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -56,14 +56,16 @@ 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 <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:: |