Merge branch 'jc/grep-author-all-match-implicit' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:35:59 +0000 (00:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Mar 2010 08:35:59 +0000 (00:35 -0800)
commit1f54d693fda851a1df81e2b6c85f1c72f4633916
tree64740b80a9b5509de9d5bbbb5290a4603a730673
parent89cd4aa8624de4fa80469ab9ef8482f44b2cc2db
parent80235ba79ef43349f455cce869397b3e726f4058
Merge branch 'jc/grep-author-all-match-implicit' into maint

* 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