Merge git://git.bogomips.org/git-svn

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 290cb48eb9dc959c380de94a787650c7d8b64436..e2b8775dd308d66027494d8705643c30581e2e65 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -639,6 +639,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.
+
 fetch.unpackLimit::
        If the number of objects fetched over the git native
        transfer is below this