summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/revision.h b/revision.h
index 983ffc0f12..475f048fb6 100644
--- a/revision.h
+++ b/revision.h
@@ -190,10 +190,10 @@ struct rev_info {
always_show_header:1;
/* Format info */
+ int show_notes;
unsigned int shown_one:1,
shown_dashes:1,
show_merge:1,
- show_notes:1,
show_notes_given:1,
show_signature:1,
pretty_given:1,
@@ -370,8 +370,8 @@ int prepare_revision_walk(struct rev_info *revs);
*/
struct commit *get_revision(struct rev_info *revs);
-char *get_revision_mark(const struct rev_info *revs,
- const struct commit *commit);
+const char *get_revision_mark(const struct rev_info *revs,
+ const struct commit *commit);
void put_revision_mark(const struct rev_info *revs,
const struct commit *commit);