diff options
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 3563f35d5..cfec32f4d 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -191,7 +191,7 @@ GIT_EXTERN(int) git_merge_base( * @param repo the repository where the commits exist * @param length The number of commits in the provided `input_array` * @param input_array oids of the commits - * @return 0 on success, GIT_ENOTFOUND if not found or error code + * @return Zero on success; GIT_ENOTFOUND or -1 on failure. */ GIT_EXTERN(int) git_merge_base_many( git_oid *out, @@ -200,6 +200,21 @@ GIT_EXTERN(int) git_merge_base_many( const git_oid input_array[]); /** + * Find a merge base in preparation for an octopus merge + * + * @param out the OID of a merge base considering all the commits + * @param repo the repository where the commits exist + * @param length The number of commits in the provided `input_array` + * @param input_array oids of the commits + * @return Zero on success; GIT_ENOTFOUND or -1 on failure. + */ +GIT_EXTERN(int) git_merge_base_octopus( + git_oid *out, + git_repository *repo, + size_t length, + const git_oid input_array[]); + +/** * Creates a `git_merge_head` from the given reference. The resulting * git_merge_head must be freed with `git_merge_head_free`. * |