diff options
| author | David Aguilar <davvid@gmail.com> | 2009-04-07 01:21:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-07 22:19:56 -0700 |
| commit | a904392eaeee1629c0ac14dae8e579bb8497636a (patch) | |
| tree | feaacf73a572e72cb424b7691ef37a89d2a214cf /Documentation/config.txt | |
| parent | f92f2038a5192ac5fc1bb4f38c49906aa45b3f1e (diff) | |
| download | git-a904392eaeee1629c0ac14dae8e579bb8497636a.tar.gz | |
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/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 94ef1a62f9..d427dafb41 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -685,6 +685,9 @@ difftool.<tool>.cmd:: is set to the name of the temporary file containing the contents of the diff post-image. +difftool.prompt:: + Prompt before each invocation of the diff tool. + diff.wordRegex:: A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character |