From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Jan 2010 08:56:15 +0000 (-0800)
Subject: Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookahead
X-Git-Tag: v1.7.0-rc0~64^2~4
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/e2d2e383d87dcbcd296ca9f21f3c8b7ef853c928?hp=e2d2e383d87dcbcd296ca9f21f3c8b7ef853c928

Merge branch 'jc/maint-1.6.4-grep-lookahead' into jc/maint-grep-lookahead

* jc/maint-1.6.4-grep-lookahead:
grep: optimize built-in grep by skipping lines that do not hit

This needs to be an evil merge as fixmatch() changed signature since
5183bf6 (grep: Allow case insensitive search of fixed-strings,
2009-11-06).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---