Skip to content

Commit 0b830ac

Browse files
artagnongitster
authored andcommitted
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 <[email protected]> Acked-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent c2999ad commit 0b830ac

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Documentation/config.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -962,12 +962,6 @@ difftool.<tool>.cmd::
962962
difftool.prompt::
963963
Prompt before each invocation of the diff tool.
964964

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-
971965
fetch.recurseSubmodules::
972966
This option can be either set to a boolean value or to 'on-demand'.
973967
Setting it to a boolean changes the behavior of fetch and pull to

Documentation/diff-config.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ diff.suppressBlankEmpty::
103103
A boolean to inhibit the standard behavior of printing a space
104104
before each empty output line. Defaults to false.
105105

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+
106112
diff.<driver>.command::
107113
The custom diff driver command. See linkgit:gitattributes[5]
108114
for details.

0 commit comments

Comments
 (0)