summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2009-04-07 08:21:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-08 05:19:56 (GMT)
commita904392eaeee1629c0ac14dae8e579bb8497636a (patch)
treefeaacf73a572e72cb424b7691ef37a89d2a214cf /Documentation/git-difftool.txt
parentf92f2038a5192ac5fc1bb4f38c49906aa45b3f1e (diff)
downloadgit-a904392eaeee1629c0ac14dae8e579bb8497636a.zip
git-a904392eaeee1629c0ac14dae8e579bb8497636a.tar.gz
git-a904392eaeee1629c0ac14dae8e579bb8497636a.tar.bz2
difftool: add support for a difftool.prompt config variable
difftool now supports difftool.prompt so that users do not have to pass --no-prompt or hit enter each time a diff tool is launched. The --prompt flag overrides the configuration variable. 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.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index af68466..15b247b 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] [<'git diff' options>]
+'git difftool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<'git diff' options>]
DESCRIPTION
-----------
@@ -21,6 +21,11 @@ OPTIONS
--no-prompt::
Do not prompt before launching a diff tool.
+--prompt::
+ Prompt before each invocation of the diff tool.
+ This is the default behaviour; the option is provided to
+ override any configuration settings.
+
-t <tool>::
--tool=<tool>::
Use the diff tool specified by <tool>.
@@ -72,6 +77,9 @@ difftool.<tool>.cmd::
+
See the `--tool=<tool>` option above for more details.
+difftool.prompt::
+ Prompt before each invocation of the diff tool.
+
SEE ALSO
--------
linkgit:git-diff[1]::