Skip to content

Commit

Permalink
Merge branch 'mg/doc-word-diff-example' into maint
Browse files Browse the repository at this point in the history
* mg/doc-word-diff-example:
  Documentation/diff: give --word-diff-regex=. example
  • Loading branch information
Jeff King committed Dec 1, 2015
2 parents 712a12e + 2c15c00 commit 2cc3640
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Documentation/diff-options.txt
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 2cc3640

Please sign in to comment.