From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Jan 2010 22:43:41 +0000 (-0800)
Subject: Merge branch 'jc/grep-lookahead'
X-Git-Tag: v1.7.0-rc0~64
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=34349bea60ec9cb3e320175cad9eb01b3054e5c6;p=git.git

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
---

34349bea60ec9cb3e320175cad9eb01b3054e5c6