diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 11:02:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 11:02:17 (GMT) |
| commit | 1bdd46cd3a2fe1e0aeb965fb0edb493064e24495 (patch) | |
| tree | 9fa257f211ffb509cb07dac585f5a80b433d795c /Documentation/gitattributes.txt | |
| parent | e22d62d9151e0e51c3dc4f951fb5d88dc30482c6 (diff) | |
| parent | 882749a04f828fccd795deec4d0bf10ba09ae549 (diff) | |
| download | git-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.zip git-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.tar.gz git-1bdd46cd3a2fe1e0aeb965fb0edb493064e24495.tar.bz2 | |
Merge branch 'tr/word-diff'
* tr/word-diff:
diff: add --word-diff option that generalizes --color-words
Conflicts:
diff.c
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index a8500d1..0523a57 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -360,7 +360,7 @@ patterns are available: Customizing word diff ^^^^^^^^^^^^^^^^^^^^^ -You can customize the rules that `git diff --color-words` uses to +You can customize the rules that `git diff --word-diff` uses to split words in a line, by specifying an appropriate regular expression in the "diff.*.wordRegex" configuration variable. For example, in TeX a backslash followed by a sequence of letters forms a command, but |