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>
Ramkumar Ramachandra committed
Nov 13, 2012 at 21:12 UTC
0b830ac52137f0f0a8f17e4caee5db7f0dee1ecc
2 files changed
+6
-6
Documentation/config.txt
-6
@@ -962,12 +962,6 @@ difftool.<tool>.cmd::
962
difftool.prompt::
963
Prompt before each invocation of the diff tool.
964
965
-diff.wordRegex::
966
- A POSIX Extended Regular Expression used to determine what is a "word"
967
- when performing word-by-word difference calculations. Character
968
- sequences that match the regular expression are "words", all other
969
- characters are *ignorable* whitespace.
970
-
965
fetch.recurseSubmodules::
966
This option can be either set to a boolean value or to 'on-demand'.
967
Setting it to a boolean changes the behavior of fetch and pull to
Documentation/diff-config.txt
+6
@@ -103,6 +103,12 @@ diff.suppressBlankEmpty::
103
A boolean to inhibit the standard behavior of printing a space
104
before each empty output line. Defaults to false.
105
106
+diff.wordRegex::
107
+ A POSIX Extended Regular Expression used to determine what is a "word"
108
+ when performing word-by-word difference calculations. Character
109
+ sequences that match the regular expression are "words", all other
110
+ characters are *ignorable* whitespace.
111
+
112
diff.<driver>.command::
113
The custom diff driver command. See linkgit:gitattributes[5]
114
for details.