Merge branch 'nd/grep-assume-unchanged' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Jan 2009 07:42:41 +0000 (23:42 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Jan 2009 07:42:41 +0000 (23:42 -0800)
* nd/grep-assume-unchanged:
grep: grep cache entries if they are "assume unchanged"
grep: support --no-ext-grep to test builtin grep

Trivial merge