diff options
| author | Boyd Stephen Smith Jr <bss@iguanasuicide.net> | 2009-01-21 03:46:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 08:51:12 (GMT) |
| commit | 98a4d87b87e9846eafd21ba232cc2b7ba3f718fc (patch) | |
| tree | 801c8a827250699199969198c34878714fb65617 /Documentation/diff-options.txt | |
| parent | 80c49c3de2d5a3aa12b0980a65f1163c8aef0c16 (diff) | |
| download | git-98a4d87b87e9846eafd21ba232cc2b7ba3f718fc.zip git-98a4d87b87e9846eafd21ba232cc2b7ba3f718fc.tar.gz git-98a4d87b87e9846eafd21ba232cc2b7ba3f718fc.tar.bz2 | |
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/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 1edb82e..164e2c5 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 |