summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2010-01-15 22:03:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-15 23:04:31 (GMT)
commitf47f1e2ce8b4022113120b32decb4436341dc3aa (patch)
tree25c7dbb1e9f3cf122faf62d86e094ad136ad2a27 /Documentation/git-difftool.txt
parenta9e11220c2656cc5d7baac4d0735c04f9be46438 (diff)
downloadgit-f47f1e2ce8b4022113120b32decb4436341dc3aa.zip
git-f47f1e2ce8b4022113120b32decb4436341dc3aa.tar.gz
git-f47f1e2ce8b4022113120b32decb4436341dc3aa.tar.bz2
difftool: Add '-x' and as an alias for '--extcmd'
This adds '-x' as a shorthand for the '--extcmd' option. Arguments to '--extcmd' can be specified separately, which was not originally possible. This also fixes the brief help text so that it mentions both '-x' and '--extcmd'. 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.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index f67d2db..5c68cff 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -7,7 +7,7 @@ git-difftool - Show changes using common diff tools
SYNOPSIS
--------
-'git difftool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<'git diff' options>]
+'git difftool' [<options>] <commit>{0,2} [--] [<path>...]
DESCRIPTION
-----------
@@ -58,6 +58,7 @@ 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`.
+-x <command>::
--extcmd=<command>::
Specify a custom command for viewing diffs.
'git-difftool' ignores the configured defaults and runs