diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2012-11-13 16:42:44 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-19 04:18:13 +0100 |
| commit | 22bc70fdf90edec98012806891f1a132fcd93575 (patch) | |
| tree | 0dc223379b2debaf1b549a439dc78e660c6026c7 /Documentation/diff-config.txt | |
| parent | Merge branch 'tj/maint-doc-commit-sign' (diff) | |
| download | git-22bc70fdf90edec98012806891f1a132fcd93575.tar.xz git-22bc70fdf90edec98012806891f1a132fcd93575.zip | |
Documentation: move diff.wordRegex from config.txt to diff-config.txt
19299a8 (Documentation: Move diff.<driver>.* from config.txt to
diff-config.txt, 2011-04-07) moved the diff configuration options to
diff-config.txt, but forgot about diff.wordRegex, which was left
behind in config.txt. Fix this.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | Documentation/diff-config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 75ab8a51ca..decd3701eb 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -107,6 +107,12 @@ diff.suppressBlankEmpty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. +diff.wordRegex:: + A POSIX Extended Regular Expression used to determine what is a "word" + when performing word-by-word difference calculations. Character + sequences that match the regular expression are "words", all other + characters are *ignorable* whitespace. + diff.<driver>.command:: The custom diff driver command. See linkgit:gitattributes[5] for details. |