Merge branch 'maint'

diff --git a/builtin.h b/builtin.h
index fdae0279ef3e4ba4d6b03f651d19e772a239ddc0..1054c6e2950c3bc433841683ca4fcf7ce6501df3 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -17,9 +17,6 @@ extern void prune_packed_objects(int);
 extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
        struct strbuf *out);
 extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);
-extern int commit_tree(const char *msg, unsigned char *tree,
-               struct commit_list *parents, unsigned char *ret,
-               const char *author);
 extern int commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {