diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-09 16:00:28 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-10-09 16:00:28 +0200 |
| commit | 8bd747cfb4e6223490a71a0f3beecbed1a1a344a (patch) | |
| tree | ba009b959c3d722534f47b5e670447fc2fcbb976 /include/git2 | |
| parent | 9f57fd64436b6441684ce5e6641a0e390304224d (diff) | |
| parent | 917f85a1a4616a93fcbba30c82caff9c1c011b83 (diff) | |
| download | libgit2-8bd747cfb4e6223490a71a0f3beecbed1a1a344a.tar.gz | |
Merge pull request #2604 from arthurschreiber/arthur/add-merge-bases-many
Add `git_merge_bases_many`
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/merge.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index bd5ebc1bd..ed1b9a30f 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -352,6 +352,21 @@ GIT_EXTERN(int) git_merge_base_many( const git_oid input_array[]); /** + * Find all merge bases given a list of commits + * + * @param out array in which to store the resulting ids + * @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_bases_many( + git_oidarray *out, + git_repository *repo, + size_t length, + 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 |