Merge branch 'jc/grep' into next
authorJunio C Hamano <junkio@cox.net>
Mon, 8 May 2006 23:41:10 +0000 (16:41 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 8 May 2006 23:41:10 +0000 (16:41 -0700)
* jc/grep:
builtin-grep: documentation
Teach -f <file> option to builtin-grep.

Trivial merge