Merge branch 'rs/grep-p' into next
commitff24f573da3f36baa41a1771296a461f3b84d8e5
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2009 16:46:19 +0000 (6 09:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jul 2009 16:46:19 +0000 (6 09:46 -0700)
treea25beb7444532f569a4b489b54d996c3dcac3ba6
parentdf2cd945d7f550ec0efab9103ab7cae480521412
parented24e401e0e6ab860475b8575e28a2c6ea99cc69
Merge branch 'rs/grep-p' into next

* rs/grep-p:
  grep: simplify -p output
builtin-grep.c