Merge branch 'jc/grep-author-all-match-implicit' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 19:44:25 +0000 (11:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2010 19:44:25 +0000 (11:44 -0800)
commit3b7be804f698c39d8f538d9996786b41c08b7181
treedd4e630fc365eaade2bbab82737cea214fca3ca9
parent7e03edc7db68bab63210a4622253f35688ae27b7
parent80235ba79ef43349f455cce869397b3e726f4058
Merge branch 'jc/grep-author-all-match-implicit' into next

* jc/grep-author-all-match-implicit:
  "log --author=me --grep=it" should find intersection, not union
builtin-grep.c
builtin-rev-list.c
grep.c
grep.h
revision.c
t/t7002-grep.sh