summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2008-07-30 07:04:14 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-29 23:17:35 -0700
commit53eda89b2fe13e974ca85367255f9a5e9ab9171f (patch)
tree57afda145a29c9076f4e031ec0c3fe5ee71de941 /commit.h
parent1ce4790bf5eeceb212f003fffcb36069c0ebb45e (diff)
downloadgit-53eda89b2fe13e974ca85367255f9a5e9ab9171f.tar.gz
merge-base: teach "git merge-base" to drive underlying merge_bases_many()
Even though the underlying function for get_merge_bases() can compute a merge base between one existing commit and another (possibly nonexistent) commit that would be created by merging many commits, the facility was not available to git-merge-base. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 77de9621d9..d163c7487b 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_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);