diff options
| author |  Boyd Stephen Smith Jr <bss@iguanasuicide.net> | 2009-01-20 21:46:57 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-21 00:51:12 -0800 |
| commit | 98a4d87b87e9846eafd21ba232cc2b7ba3f718fc (patch) | |
| tree | 801c8a827250699199969198c34878714fb65617 /Documentation | |
| parent | color-words: make regex configurable via attributes (diff) | |
| download | tgif-98a4d87b87e9846eafd21ba232cc2b7ba3f718fc.tar.xz | |
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')
| -rw-r--r-- | Documentation/config.txt | 6 | ||||
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
2 files changed, 10 insertions, 3 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 diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 1edb82e8e1..164e2c5348 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -103,9 +103,10 @@ expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline. + -The regex can also be set via a diff driver, see -linkgit:gitattributes[1]; giving it explicitly overrides any diff -driver setting. +The regex can also be set via a diff driver or configuration option, see +linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly +overrides any diff driver or configuration setting. Diff drivers +override configuration settings. --no-renames:: Turn off rename detection, even when the configuration |