Merge branch 'bc/do-not-recurse-in-die'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 789abe75de7c04839cd7ec537d11e5808554ff78..9a0544cf1fba605bde7031c23016bc24db741417 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1211,8 +1211,16 @@ gitweb.snapshot::
 grep.lineNumber::
        If set to true, enable '-n' option by default.
 
+grep.patternType::
+       Set the default matching behavior. Using a value of 'basic', 'extended',
+       'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
+       '--fixed-strings', or '--perl-regexp' option accordingly, while the
+       value 'default' will return to the default matching behavior.
+
 grep.extendedRegexp::
-       If set to true, enable '--extended-regexp' option by default.
+       If set to true, enable '--extended-regexp' option by default. This
+       option is ignored when the 'grep.patternType' option is set to a value
+       other than 'default'.
 
 gpg.program::
        Use this custom program instead of "gpg" found on $PATH when