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-grep.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-grep.c')
| -rw-r--r-- | builtin-grep.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 26979577d3..371db0aa9e 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -844,6 +844,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) opt.relative = 1; opt.pathname = 1; opt.pattern_tail = &opt.pattern_list; + opt.header_tail = &opt.header_list; opt.regflags = REG_NEWLINE; opt.max_depth = -1; |