Merge branch 'rc/ls-remote-default'

diff --git a/builtin.h b/builtin.h
index 464588b299a473e9e1ee58cbc61e2f981030e37d..b614d12b9f3464eff9ecfa90c2eb5ecf43a82b7e 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -16,9 +16,7 @@ extern const char *help_unknown_cmd(const char *cmd);
 extern void prune_packed_objects(int);
 extern int fmt_merge_msg(int merge_summary, 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 fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out);
 extern int commit_notes(struct notes_tree *t, const char *msg);
 
 struct notes_rewrite_cfg {