Code

Merge branch 'jc/grep-lookahead'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:43:41 +0000 (14:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:43:41 +0000 (14:43 -0800)
* 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

1  2 
Documentation/config.txt
Makefile
builtin-grep.c

Simple merge
diff --cc Makefile
Simple merge
diff --cc builtin-grep.c
Simple merge