diff options
| author | Boyd Stephen Smith Jr <bss@iguanasuicide.net> | 2009-01-21 06:46:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 11:51:12 +0300 |
| commit | 98a4d87b87e9846eafd21ba232cc2b7ba3f718fc (patch) | |
| tree | 801c8a827250699199969198c34878714fb65617 /Documentation/config.txt | |
| parent | 80c49c3de2d5a3aa12b0980a65f1163c8aef0c16 (diff) | |
color-words: Support diff.wordregex config option
When diff is invoked with --color-words (w/o =regex), use the regular
expression the user has configured as diff.wordregex.
diff drivers configured via attributes take precedence over the
diff.wordregex-words setting. If the user wants to change them, they have
their own configuration variables.
Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7408bb2d34..0ca983ac3b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -639,6 +639,12 @@ diff.suppress-blank-empty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. +diff.wordregex:: + A POSIX Extended Regular Expression used to determine what is a "word" + when performing word-by-word difference calculations. Character + sequences that match the regular expression are "words", all other + characters are *ignorable* whitespace. + fetch.unpackLimit:: If the number of objects fetched over the git native transfer is below this |