mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mg/doc-word-diff-example' into maint

Browse Source 
* mg/doc-word-diff-example:
  Documentation/diff: give --word-diff-regex=. example
This commit is contained in:
Jeff King
2015-12-01 17:21:11 -05:00
parent 712a12e506 2c15c00651
commit 2cc36407df
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/diff-options.txt
View File

@ -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 A match that contains a newline is silently truncated(!) at the
newline. 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 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 linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly
overrides any diff driver or configuration setting. Diff drivers overrides any diff driver or configuration setting. Diff drivers