diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:35:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:35:59 -0800 |
| commit | 1f54d693fda851a1df81e2b6c85f1c72f4633916 (patch) | |
| tree | 64740b80a9b5509de9d5bbbb5290a4603a730673 /builtin-rev-list.c | |
| parent | 89cd4aa8624de4fa80469ab9ef8482f44b2cc2db (diff) | |
| parent | 80235ba79ef43349f455cce869397b3e726f4058 (diff) | |
| download | git-1f54d693fda851a1df81e2b6c85f1c72f4633916.tar.gz | |
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
Diffstat (limited to 'builtin-rev-list.c')
| -rw-r--r-- | builtin-rev-list.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index c924b3a2c7..5679170e82 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -371,8 +371,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) revs.diff) usage(rev_list_usage); - save_commit_buffer = revs.verbose_header || - revs.grep_filter.pattern_list; + save_commit_buffer = (revs.verbose_header || + revs.grep_filter.pattern_list || + revs.grep_filter.header_list); if (bisect_list) revs.limited = 1; |