From: Junio C Hamano Date: Fri, 17 Dec 2010 00:36:03 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.7.4-rc0~28 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38a5932be8a8f0b0bd3bb949bdc5258d9c753f15;hp=-c;p=git.git Merge branch 'maint' * maint: difftool: provide basename to external tools git-difftool.txt: correct the description of $BASE and describe $MERGED --- 38a5932be8a8f0b0bd3bb949bdc5258d9c753f15 diff --combined Documentation/git-difftool.txt index 6fffbc7bf,573843211..db87f1d42 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@@ -7,14 -7,13 +7,14 @@@ git-difftool - Show changes using commo SYNOPSIS -------- -'git difftool' [] {0,2} [--] [...] +'git difftool' [] [ []] [--] [...] DESCRIPTION ----------- 'git difftool' is a git command that allows you to compare and edit files between revisions using common diff tools. 'git difftool' is a frontend -to 'git diff' and accepts the same options and arguments. +to 'git diff' and accepts the same options and arguments. See +linkgit:git-diff[1]. OPTIONS ------- @@@ -56,14 -55,16 +56,16 @@@ the configured command line will be inv 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::