diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 12:44:06 -0800 |
| commit | 6b45b8c088f21566cd9cb7839f8421bf616382a2 (patch) | |
| tree | cfafac45e083d85e011aef8e6a77b12b6d1b103e /builtin-grep.c | |
| parent | 82cd8358e8203fa02da18e8ee71449cb45c4157d (diff) | |
| parent | 80235ba79ef43349f455cce869397b3e726f4058 (diff) | |
| download | git-6b45b8c088f21566cd9cb7839f8421bf616382a2.tar.gz | |
Merge branch 'jc/grep-author-all-match-implicit'
* 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 552ef1face..d05107dd9f 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -868,6 +868,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; |