diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:43:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 22:43:41 (GMT) |
| commit | 34349bea60ec9cb3e320175cad9eb01b3054e5c6 (patch) | |
| tree | a716401563f17bcc6b7b425d03b6226c8984b475 /userdiff.h | |
| parent | 886932e2816ba8554ba0bf6c2c91fdfa6877dd65 (diff) | |
| parent | 308162372d0aa202ff45743e02253e20a4fac4d7 (diff) | |
| download | git-34349bea60ec9cb3e320175cad9eb01b3054e5c6.zip git-34349bea60ec9cb3e320175cad9eb01b3054e5c6.tar.gz git-34349bea60ec9cb3e320175cad9eb01b3054e5c6.tar.bz2 | |
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
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions