]> git.ipfire.org Git - thirdparty/git.git/commit - git-difftool--helper.sh
difftool: add support for a difftool.prompt config variable
authorDavid Aguilar <davvid@gmail.com>
Tue, 7 Apr 2009 08:21:22 +0000 (01:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Apr 2009 05:19:56 +0000 (22:19 -0700)
commita904392eaeee1629c0ac14dae8e579bb8497636a
treefeaacf73a572e72cb424b7691ef37a89d2a214cf
parentf92f2038a5192ac5fc1bb4f38c49906aa45b3f1e
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>
Documentation/config.txt
Documentation/git-difftool.txt
git-difftool--helper.sh
git-difftool.perl
t/t7800-difftool.sh