diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:00:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-30 00:00:07 -0700 |
| commit | be653d6cb87d17c1d70d31cb7cfcb004d48def7b (patch) | |
| tree | 5d9eb8e0e0635661448cd98593aec739f7190e85 /Documentation | |
| parent | 3d109dd8ef012eac37702a2afa980b545ac08467 (diff) | |
| parent | d0042abe14b3aece87595d365d6eba84c3e53327 (diff) | |
| download | git-be653d6cb87d17c1d70d31cb7cfcb004d48def7b.tar.gz git-be653d6cb87d17c1d70d31cb7cfcb004d48def7b.tar.xz | |
Merge branch 'mk/grep-pcre'
* mk/grep-pcre:
git-grep: Fix problems with recently added tests
git-grep: Update tests (mainly for -P)
Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
git-grep: update tests now regexp type is "last one wins"
git-grep: do not die upon -F/-P when grep.extendedRegexp is set.
git-grep: Bail out when -P is used with -F or -E
grep: Add basic tests
configure: Check for libpcre
git-grep: Learn PCRE
grep: Extract compile_regexp_failed() from compile_regexp()
grep: Fix a typo in a comment
grep: Put calls to fixmatch() and regmatch() into patmatch()
contrib/completion: --line-number to git grep
Documentation: Add --line-number to git-grep synopsis
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-grep.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index d7523b3e4..e150c77cf 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -12,7 +12,8 @@ SYNOPSIS 'git grep' [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp] [-v | --invert-match] [-h|-H] [--full-name] [-E | --extended-regexp] [-G | --basic-regexp] - [-F | --fixed-strings] [-n] + [-P | --perl-regexp] + [-F | --fixed-strings] [-n | --line-number] [-l | --files-with-matches] [-L | --files-without-match] [(-O | --open-files-in-pager) [<pager>]] [-z | --null] @@ -97,6 +98,11 @@ OPTIONS Use POSIX extended/basic regexp for patterns. Default is to use basic regexp. +-P:: +--perl-regexp:: + Use Perl-compatible regexp for patterns. Requires libpcre to be + compiled in. + -F:: --fixed-strings:: Use fixed strings for patterns (don't interpret pattern |