diff options
| author | David Aguilar <davvid@gmail.com> | 2010-01-09 20:02:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-09 22:41:30 -0800 |
| commit | 1c6f5b52b7b13bbc6cf404cb5ef9e64fda37655c (patch) | |
| tree | 99d43713fe0d6097883ef9d254e263bcd3ea34a8 /Documentation/git-difftool.txt | |
| parent | 61ed71dcff8448b0700ef032aa1f962649306624 (diff) | |
| download | git-1c6f5b52b7b13bbc6cf404cb5ef9e64fda37655c.tar.gz git-1c6f5b52b7b13bbc6cf404cb5ef9e64fda37655c.tar.xz | |
difftool: Allow specifying unconfigured commands with --extcmd
git-difftool requires difftool.<tool>.cmd configuration even when
tools use the standard "$diffcmd $from $to" form. This teaches
git-difftool to run these tools in lieu of configuration by
allowing the command to be specified on the command line.
Reference: http://article.gmane.org/gmane.comp.version-control.git/133377
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
| -rw-r--r-- | Documentation/git-difftool.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index a5bce6278..f67d2db76 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -58,6 +58,11 @@ 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`. +--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. + -g:: --gui:: When 'git-difftool' is invoked with the `-g` or `--gui` option |