aboutsummaryrefslogtreecommitdiff
path: root/grep.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-08 00:35:59 -0800
committerJunio C Hamano <gitster@pobox.com>2010-03-08 00:35:59 -0800
commit1f54d693fda851a1df81e2b6c85f1c72f4633916 (patch)
tree64740b80a9b5509de9d5bbbb5290a4603a730673 /grep.h
parent89cd4aa8624de4fa80469ab9ef8482f44b2cc2db (diff)
parent80235ba79ef43349f455cce869397b3e726f4058 (diff)
downloadgit-1f54d693fda851a1df81e2b6c85f1c72f4633916.tar.gz
git-1f54d693fda851a1df81e2b6c85f1c72f4633916.tar.xz
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 'grep.h')
-rw-r--r--grep.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/grep.h b/grep.h
index 970308799..d35bc29bf 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;