X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-difftool.txt;h=a5d9c121f1b0398413814e8bc68fdb3bd3bf3c2b;hb=1d5742cbf746f9556e6aefdfbed54c452c235d51;hp=6fffbc7bf89d01b14505c03993de9d97d37e9404;hpb=73fd7f3761eeef0e28bbf04727c8a1e751a9792e;p=git.git diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 6fffbc7bf..a5d9c121f 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 :: --extcmd=:: 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:: @@ -107,15 +109,6 @@ linkgit:git-mergetool[1]:: linkgit:git-config[1]:: Get and set repository or global options - -AUTHOR ------- -Written by David Aguilar . - -Documentation --------------- -Documentation by David Aguilar and the git-list . - GIT --- Part of the linkgit:git[1] suite