summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2015-11-20 13:36:14 (GMT)
committerJeff King <peff@peff.net>2015-11-24 23:38:46 (GMT)
commit2c15c006511e03e775fa5f2e44b37ae9313833b0 (patch)
treec183df9118a08b319f735b082c7acd66fdce011b /Documentation/diff-options.txt
parent5cb2e162d21fa45a63f186b31970e2e9c9b10ba9 (diff)
downloadgit-2c15c006511e03e775fa5f2e44b37ae9313833b0.zip
git-2c15c006511e03e775fa5f2e44b37ae9313833b0.tar.gz
git-2c15c006511e03e775fa5f2e44b37ae9313833b0.tar.bz2
Documentation/diff: give --word-diff-regex=. example
It's just so useful. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'Documentation/diff-options.txt')
-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 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