From 2c15c006511e03e775fa5f2e44b37ae9313833b0 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Fri, 20 Nov 2015 14:36:14 +0100 Subject: [PATCH] Documentation/diff: give --word-diff-regex=. example It's just so useful. Signed-off-by: Michael J Gruber Signed-off-by: Jeff King --- Documentation/diff-options.txt | 3 +++ 1 file changed, 3 insertions(+) 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