| commit | 34349bea60ec9cb3e320175cad9eb01b3054e5c6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:43:41 +0000 (20 14:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:43:41 +0000 (20 14:43 -0800) | ||
| tree | a716401563f17bcc6b7b425d03b6226c8984b475 | treesnapshot (tar.gz zip) |
| parent | 886932e2816ba8554ba0bf6c2c91fdfa6877dd65 | commitdiff |
| parent | 308162372d0aa202ff45743e02253e20a4fac4d7 | commitdiff |
Merge branch 'jc/grep-lookahead'
* jc/grep-lookahead:
grep --no-index: allow use of "git grep" outside a git repository
grep: prepare to run outside of a work tree
grep: rip out pessimization to use fixmatch()
grep: rip out support for external grep
grep: optimize built-in grep by skipping lines that do not hit
Conflicts:
builtin-grep.c
t/t7002-grep.sh
* jc/grep-lookahead:
grep --no-index: allow use of "git grep" outside a git repository
grep: prepare to run outside of a work tree
grep: rip out pessimization to use fixmatch()
grep: rip out support for external grep
grep: optimize built-in grep by skipping lines that do not hit
Conflicts:
builtin-grep.c
t/t7002-grep.sh
| Documentation/config.txt | diff1 | diff2 | blobhistory |
| Makefile | diff1 | diff2 | blobhistory |
| builtin-grep.c | diff1 | diff2 | blobhistory |