git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge

diff --git a/commit.h b/commit.h
index 77de9621d9c926c6fb8a2bf9ca81c6c376a2ad41..d163c7487b0dd65d6c0cc9cb568c3ae44e30726d 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -121,6 +121,7 @@ int read_graft_file(const char *graft_file);
 struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
 
 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
+extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup);
 extern struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 
 extern int register_shallow(const unsigned char *sha1);