aboutsummaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJ Smith <dark.panda@gmail.com>2012-08-03 10:53:50 -0400
committerJunio C Hamano <gitster@pobox.com>2012-08-03 09:58:02 -0700
commit84befcd0a4a074e2ae191c32be09d2e82d5db114 (patch)
treec33fa66c5a950c3fc572a87167a1b0d4b1cc9036 /Documentation/config.txt
parent0e4c8822e98e27c3c63125570c8bcbf0a8fd34da (diff)
downloadgit-84befcd0a4a074e2ae191c32be09d2e82d5db114.tar.gz
git-84befcd0a4a074e2ae191c32be09d2e82d5db114.tar.xz
grep: add a grep.patternType configuration setting
The grep.extendedRegexp configuration setting enables the -E flag on grep by default but there are no equivalents for the -G, -F and -P flags. Rather than adding an additional setting for grep.fooRegexp for current and future pattern matching options, add a grep.patternType setting that can accept appropriate values for modifying the default grep pattern matching behavior. The current values are "basic", "extended", "fixed", "perl" and "default" for setting -G, -E, -F, -P and the default behavior respectively. When grep.patternType is set to a value other than "default", the grep.extendedRegexp setting is ignored. The value of "default" restores the current default behavior, including the grep.extendedRegexp behavior. Signed-off-by: J Smith <dark.panda@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index b49feb582..df82d41ae 100644
--- 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