Merge branch 'rs/fgrep'
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Jan 2009 07:05:28 +0000 (23:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Jan 2009 07:05:28 +0000 (23:05 -0800)
* rs/fgrep:
grep: don't call regexec() for fixed strings
grep -w: forward to next possible position after rejected match

Trivial merge