grep: add a grep.patternType configuration setting

diff --git a/Documentation/config.txt b/Documentation/config.txt
index b49feb582ef6c780a9dd1831bcd7e013e774b7c6..df82d41ae5ec3e12b00dbb28d9a84dad9137af60 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1196,8 +1196,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