diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-03-02 21:44:06 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-02 21:44:06 +0100 |
commit | 6b45b8c088f21566cd9cb7839f8421bf616382a2 (patch) | |
tree | cfafac45e083d85e011aef8e6a77b12b6d1b103e /grep.h | |
parent | fallback SSH_ASKPASS when GIT_ASKPASS not set (diff) | |
parent | "log --author=me --grep=it" should find intersection, not union (diff) | |
download | git-6b45b8c088f21566cd9cb7839f8421bf616382a2.tar.xz git-6b45b8c088f21566cd9cb7839f8421bf616382a2.zip |
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 'grep.h')
-rw-r--r-- | grep.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -59,6 +59,8 @@ struct grep_expr { struct grep_opt { struct grep_pat *pattern_list; struct grep_pat **pattern_tail; + struct grep_pat *header_list; + struct grep_pat **header_tail; struct grep_expr *pattern_expression; const char *prefix; int prefix_length; |