X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=commit.h;h=2acfc79d3483b4c83c1c181a8ac1505393e96ee5;hb=f4022fa33f1b0a63029d1bc3748f01f720151218;hp=7f8c5ee0fc15fd93c83a29d350d12fdb956657b9;hpb=653194758ee338b7c87d011007c532ed5cf68d45;p=git.git

diff --git a/commit.h b/commit.h
index 7f8c5ee0f..2acfc79d3 100644
--- 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);
@@ -139,4 +140,6 @@ static inline int single_parent(struct commit *commit)
 	return commit->parents && !commit->parents->next;
 }
 
+struct commit_list *reduce_heads(struct commit_list *heads);
+
 #endif /* COMMIT_H */