diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-30 07:00:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-30 07:00:07 (GMT) |
| commit | be653d6cb87d17c1d70d31cb7cfcb004d48def7b (patch) | |
| tree | 5d9eb8e0e0635661448cd98593aec739f7190e85 /contrib | |
| parent | 3d109dd8ef012eac37702a2afa980b545ac08467 (diff) | |
| parent | d0042abe14b3aece87595d365d6eba84c3e53327 (diff) | |
| download | git-be653d6cb87d17c1d70d31cb7cfcb004d48def7b.zip git-be653d6cb87d17c1d70d31cb7cfcb004d48def7b.tar.gz git-be653d6cb87d17c1d70d31cb7cfcb004d48def7b.tar.bz2 | |
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 'contrib')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index bb8d7d0..b36290f 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1441,8 +1441,9 @@ _git_grep () __gitcomp " --cached --text --ignore-case --word-regexp --invert-match - --full-name + --full-name --line-number --extended-regexp --basic-regexp --fixed-strings + --perl-regexp --files-with-matches --name-only --files-without-match --max-depth |