| commit | d11013544409d29af3c501d7d50f583e26bb689a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 May 2011 23:26:49 +0000 (15 16:26 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 15 May 2011 23:26:49 +0000 (15 16:26 -0700) | ||
| tree | 681adbfdfdd2a7944984c937fb2a30aafa169dff | treesnapshot (tar.gz zip) |
| parent | 9d35a6e977903df446efc3b037fb8893d3a2471f | commitdiff |
| parent | cca2c172e0c37eff8e743b63016b6bc604b38a7d | commitdiff |
Merge branch 'mk/grep-pcre' into next
* mk/grep-pcre:
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
* mk/grep-pcre:
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