summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorBoyd Stephen Smith Jr <bss@iguanasuicide.net>2009-01-21 04:59:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-01-22 07:52:16 (GMT)
commitae3b970ac3e21324a95fea75213c2569180d74c6 (patch)
tree28f733efa6f884e2740ea8ee9dcda292122c0bf2 /Documentation/gitattributes.txt
parent98a4d87b87e9846eafd21ba232cc2b7ba3f718fc (diff)
downloadgit-ae3b970ac3e21324a95fea75213c2569180d74c6.zip
git-ae3b970ac3e21324a95fea75213c2569180d74c6.tar.gz
git-ae3b970ac3e21324a95fea75213c2569180d74c6.tar.bz2
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/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index ba3ba12..227934f 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