diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:26:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:26:43 -0700 |
| commit | a86ed83cce0fc0b9a9fe4e17ac1bf4f719028d20 (patch) | |
| tree | b601185c28e5ea4f4a624debe01427465147650c /revision.h | |
| parent | b6a7a06aa6f083f21b0fca2558c737324eda1602 (diff) | |
| parent | 66d681998411e8e5034080d5267a5e0f6cdc0c17 (diff) | |
| download | git-a86ed83cce0fc0b9a9fe4e17ac1bf4f719028d20.tar.gz git-a86ed83cce0fc0b9a9fe4e17ac1bf4f719028d20.tar.xz | |
Merge branch 'tr/notes-display'
* tr/notes-display:
git-notes(1): add a section about the meaning of history
notes: track whether notes_trees were changed at all
notes: add shorthand --ref to override GIT_NOTES_REF
commit --amend: copy notes to the new commit
rebase: support automatic notes copying
notes: implement helpers needed for note copying during rewrite
notes: implement 'git notes copy --stdin'
rebase -i: invoke post-rewrite hook
rebase: invoke post-rewrite hook
commit --amend: invoke post-rewrite hook
Documentation: document post-rewrite hook
Support showing notes from more than one notes tree
test-lib: unset GIT_NOTES_REF to stop it from influencing tests
Conflicts:
git-am.sh
refs.c
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 ceae4cae7..568f1c98d 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 |