Merge branch 'jc/grep-author-all-match-implicit'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800)
* jc/grep-author-all-match-implicit:
  "log --author=me --grep=it" should find intersection, not union

1  2 
builtin-grep.c
builtin-rev-list.c
grep.c
grep.h
revision.c
t/t7002-grep.sh

diff --cc builtin-grep.c
Simple merge
Simple merge
diff --cc grep.c
Simple merge
diff --cc grep.h
Simple merge
diff --cc revision.c
Simple merge
diff --cc t/t7002-grep.sh
Simple merge