diff options
author | Miklos Vajna <vmiklos@frugalware.org> | 2008-06-27 18:22:00 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-06-30 22:45:51 -0700 |
commit | 5240c9d75d8e1b747da427ba6320432d3201168a (patch) | |
tree | df51b4adadebc1f71fbb1fd3ba2fe1bdf99897db /commit.h | |
parent | 0b9a969e0fbb0a09e9de931cfe27005cbfd6cb7d (diff) | |
download | git-5240c9d75d8e1b747da427ba6320432d3201168a.tar.gz |
Introduce get_octopus_merge_bases() in commit.c
This is like get_merge_bases() but it works for multiple heads, like
show-branch --merge-base.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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); |