Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/diff: give --word-diff-regex=. example
author
Michael J Gruber
<git@drmicha.warpmail.net>
Fri, 20 Nov 2015 13:36:14 +0000
(14:36 +0100)
committer
Jeff King
<peff@peff.net>
Tue, 24 Nov 2015 23:38:46 +0000
(18:38 -0500)
It's just so useful.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Jeff King <peff@peff.net>
Documentation/diff-options.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
5cb2e16
)
diff --git
a/Documentation/diff-options.txt
b/Documentation/diff-options.txt
index d56ca90998a740dbe4cc5c242326023b4cc769b3..306b7e360409255a7aafaa3860d6d6c0412fb870 100644
(file)
--- 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