diff options
| author |  Boyd Stephen Smith Jr <bss@iguanasuicide.net> | 2009-01-20 22:59:54 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-01-21 23:52:16 -0800 |
| commit | ae3b970ac3e21324a95fea75213c2569180d74c6 (patch) | |
| tree | 28f733efa6f884e2740ea8ee9dcda292122c0bf2 /Documentation | |
| parent | color-words: Support diff.wordregex config option (diff) | |
| download | tgif-ae3b970ac3e21324a95fea75213c2569180d74c6.tar.xz | |
Change the spelling of "wordregex".
Use "wordRegex" for configuration variable names. Use "word_regex" for C
language tokens.
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 | 2 | ||||
| -rw-r--r-- | Documentation/gitattributes.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 0ca983ac3b..332213e65d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -639,7 +639,7 @@ 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:: +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 diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index ba3ba12730..227934f59a 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -341,14 +341,14 @@ Customizing word diff You can customize the rules that `git diff --color-words` uses to split words in a line, by specifying an appropriate regular expression -in the "diff.*.wordregex" configuration variable. For example, in TeX +in the "diff.*.wordRegex" configuration variable. For example, in TeX a backslash followed by a sequence of letters forms a command, but several such commands can be run together without intervening whitespace. To separate them, use a regular expression such as ------------------------ [diff "tex"] - wordregex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" + wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" ------------------------ A built-in pattern is provided for all languages listed in the |