Introduce get_octopus_merge_bases() in commit.c

[thirdparty/git.git] / commit.h

diff --git a/commit.h b/commit.h
index 7f8c5ee0fc15fd93c83a29d350d12fdb956657b9..dcec7fb9a2264d068037aa57894ba0a3ae43231a 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_octopus_merge_bases(struct commit_list *in);
 
 extern int register_shallow(const unsigned char *sha1);
 extern int unregister_shallow(const unsigned char *sha1);