X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitattributes.txt;h=227934f59adc42e347cdf4698586d4bca26ca6a3;hb=5c7eee03da32ac8ff5e91159670558b0d7fb9b1a;hp=ba3ba12730a3c4ef1c7651d5f86645a8db98b79f;hpb=80c49c3de2d5a3aa12b0980a65f1163c8aef0c16;p=git.git diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index ba3ba1273..227934f59 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