diff options
| author | Jeff King <peff@peff.net> | 2015-12-01 22:21:11 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 22:21:11 (GMT) |
| commit | 2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4 (patch) | |
| tree | 94caf745ceb360e6fed5e3c23c6cb52323c85658 | |
| parent | 712a12e50612ec594d9cc4235a9e0825a50d3097 (diff) | |
| parent | 2c15c006511e03e775fa5f2e44b37ae9313833b0 (diff) | |
| download | git-2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4.zip git-2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4.tar.gz git-2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4.tar.bz2 | |
Merge branch 'mg/doc-word-diff-example' into maint
* mg/doc-word-diff-example:
Documentation/diff: give --word-diff-regex=. example
| -rw-r--r-- | Documentation/diff-options.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index d56ca90..306b7e3 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -267,6 +267,9 @@ expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline. + +For example, `--word-diff-regex=.` will treat each character as a word +and, correspondingly, show differences character by character. ++ The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers |