diff options
| author | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2012-11-27 18:59:22 -0800 |
| commit | 64c5112188647fcbfbe2bbfb897abfbc21912ba8 (patch) | |
| tree | 5113408a049178d14664f72cc1666655783d95d5 /include/git2/merge.h | |
| parent | 469827812f95e979e3c6468567b2c9ed138a9849 (diff) | |
| parent | ca94e031fa21787ae6336f0aada1b01b2dd22077 (diff) | |
| download | libgit2-64c5112188647fcbfbe2bbfb897abfbc21912ba8.tar.gz | |
Merge pull request #1087 from libgit2/great-renaming
The Great Renaming of 2012
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 37b1c787d..59493969c 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -27,8 +27,13 @@ GIT_BEGIN_DECL * @param repo the repository where the commits exist * @param one one of the commits * @param two the other commit + * @return Zero on success; GIT_ENOTFOUND or -1 on failure. */ -GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two); +GIT_EXTERN(int) git_merge_base( + git_oid *out, + git_repository *repo, + const git_oid *one, + const git_oid *two); /** * Find a merge base given a list of commits @@ -37,8 +42,13 @@ GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid * @param repo the repository where the commits exist * @param input_array oids of the commits * @param length The number of commits in the provided `input_array` + * @return Zero on success; GIT_ENOTFOUND or -1 on failure. */ -GIT_EXTERN(int) git_merge_base_many(git_oid *out, git_repository *repo, const git_oid input_array[], size_t length); +GIT_EXTERN(int) git_merge_base_many( + git_oid *out, + git_repository *repo, + const git_oid input_array[], + size_t length); /** @} */ GIT_END_DECL |