summaryrefslogtreecommitdiffstats
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-02 21:44:06 +0100
committerJunio C Hamano <gitster@pobox.com>2010-03-02 21:44:06 +0100
commit6b45b8c088f21566cd9cb7839f8421bf616382a2 (patch)
treecfafac45e083d85e011aef8e6a77b12b6d1b103e /grep.h
parentfallback SSH_ASKPASS when GIT_ASKPASS not set (diff)
parent"log --author=me --grep=it" should find intersection, not union (diff)
downloadgit-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.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index 9703087996..d35bc29bfd 100644
--- a/grep.h
+++ b/grep.h
@@ -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;