summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-10-29 08:12:15 (GMT)
committerJeff King <peff@peff.net>2012-10-29 08:12:15 (GMT)
commitd2f4469b13dcd5c850058fdee4b039f07bb33142 (patch)
tree8429b77b5076d354bac240ed165d4b27c7f79ff6 /Documentation
parentfdb4d27158e4f8e19ac3b11b896bff92038afbfa (diff)
parent0657bcbf6f0830bc4ce25d05060706f35f1d4eb7 (diff)
downloadgit-d2f4469b13dcd5c850058fdee4b039f07bb33142.zip
git-d2f4469b13dcd5c850058fdee4b039f07bb33142.tar.gz
git-d2f4469b13dcd5c850058fdee4b039f07bb33142.tar.bz2
Merge branch 'jc/grep-pcre-loose-ends'
"git log -F -E --grep='<ere>'" failed to use the given <ere> pattern as extended regular expression, and instead looked for the string literally. The early part of this series is a fix for it; the latter part teaches log to respect the grep.* configuration. * jc/grep-pcre-loose-ends: log: honor grep.* configuration log --grep: accept --basic-regexp and --perl-regexp log --grep: use the same helper to set -E/-F options as "git grep" revisions: initialize revs->grep_filter using grep_init() grep: move pattern-type bits support to top-level grep.[ch] grep: move the configuration parsing logic to grep.[ch] builtin/grep.c: make configuration callback more reusable
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/rev-list-options.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index ee49743..1ec14a0 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -79,6 +79,11 @@ if it is part of the log message.
Match the regexp limiting patterns without regard to letters case.
+--basic-regexp::
+
+ Consider the limiting patterns to be basic regular expressions;
+ this is the default.
+
-E::
--extended-regexp::
@@ -91,6 +96,11 @@ if it is part of the log message.
Consider the limiting patterns to be fixed strings (don't interpret
pattern as a regular expression).
+--perl-regexp::
+
+ Consider the limiting patterns to be Perl-compatible regexp.
+ Requires libpcre to be compiled in.
+
--remove-empty::
Stop when a given path disappears from the tree.