Code

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)
commit4ca72f20c382134b85f22fca83472572e5542f4f
treebf74dd4087d4d279fe7ceb013efe040811e20f15
parentb0121fb3f279a9cf13aff9da060e742aef3a83fa
parent1c57119c70332faf206b5c7e2f3639b96a221717
Merge branch 'jc/grep' into next

* jc/grep:
  builtin-grep: documentation
  Teach -f <file> option to builtin-grep.