Merge branch 'jh/notes-merge'

[git.git] / builtin.h

diff --git a/builtin.h b/builtin.h
index 8dd4569b3c06654826c298b6b52dcf2ac17481bb..c3e5db268566d3f78cebb4021ed0a201e1dbfa87 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -16,7 +16,7 @@ extern const char git_more_info_string[];
 extern void prune_packed_objects(int);
 extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
                         int merge_title, int shortlog_len);
-extern int commit_notes(struct notes_tree *t, const char *msg);
+extern void commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {
        struct notes_tree **trees;