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

diff --cc builtin-grep.c
Simple merge

diff --cc builtin-rev-list.c
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