diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-03-12 18:04:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-12 21:55:39 -0800 |
| commit | 894a9d333e9e2015cad00d95250b7c5d3acea8b6 (patch) | |
| tree | 2bab79483f959c7661e87ef70b1976ab9aa65bdb /revision.h | |
| parent | 6ceeaee7ea5bb754c76ce93c5b289f72d69fdb92 (diff) | |
| download | git-894a9d333e9e2015cad00d95250b7c5d3acea8b6.tar.gz git-894a9d333e9e2015cad00d95250b7c5d3acea8b6.tar.xz | |
Support showing notes from more than one notes tree
With this patch, you can set notes.displayRef to a glob that points at
your favourite notes refs, e.g.,
[notes]
displayRef = refs/notes/*
Then git-log and friends will show notes from all trees.
Thanks to Junio C Hamano for lots of feedback, which greatly
influenced the design of the entire series and this commit in
particular.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
| -rw-r--r-- | revision.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/revision.h b/revision.h index a14deefc2..580f6ecce 100644 --- a/revision.h +++ b/revision.h @@ -3,6 +3,7 @@ #include "parse-options.h" #include "grep.h" +#include "notes.h" #define SEEN (1u<<0) #define UNINTERESTING (1u<<1) @@ -20,6 +21,7 @@ struct rev_info; struct log_info; +struct string_list; struct rev_info { /* Starting list */ @@ -126,6 +128,9 @@ struct rev_info { struct reflog_walk_info *reflog_info; struct decoration children; struct decoration merge_simplification; + + /* notes-specific options: which refs to show */ + struct display_notes_opt notes_opt; }; #define REV_TREE_SAME 0 |