diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2009-01-17 17:29:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-17 10:44:21 -0800 |
| commit | 80c49c3de2d5a3aa12b0980a65f1163c8aef0c16 (patch) | |
| tree | 6a87dd650320b12e63e1578ba69280f53b1d09b5 /Documentation/diff-options.txt | |
| parent | c4b252c3d894673968b144d8e10b79ef22c17b0a (diff) | |
| download | git-80c49c3de2d5a3aa12b0980a65f1163c8aef0c16.tar.gz git-80c49c3de2d5a3aa12b0980a65f1163c8aef0c16.tar.xz | |
color-words: make regex configurable via attributes
Make the --color-words splitting regular expression configurable via
the diff driver's 'wordregex' attribute. The user can then set the
driver on a file in .gitattributes. If a regex is given on the
command line, it overrides the driver's setting.
We also provide built-in regexes for the languages that already had
funcname patterns, and add an appropriate diff driver entry for C/++.
(The patterns are designed to run UTF-8 sequences into a single chunk
to make sure they remain readable.)
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 8689a92d8..1edb82e8e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -102,6 +102,10 @@ differences. You may want to append `|[^[:space:]]` to your regular 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. --no-renames:: Turn off rename detection, even when the configuration |