summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2015-12-01 17:21:11 -0500
committerLibravatar Jeff King <peff@peff.net>2015-12-01 17:21:11 -0500
commit2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4 (patch)
tree94caf745ceb360e6fed5e3c23c6cb52323c85658
parentMerge branch 'cb/ssl-config-pathnames' into maint (diff)
parentDocumentation/diff: give --word-diff-regex=. example (diff)
downloadtgif-2cc36407df4eb919c4ad3da0561d1bbdb9e0c0c4.tar.xz
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.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index d56ca90998..306b7e3604 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