diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-22 05:55:39 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-22 05:59:35 +0200 |
| commit | 07fb67f90e79ecf35672008fed262a7db41d9790 (patch) | |
| tree | 32379a7389bf089a5da0284e294a7ce3962e8dec /include/git2/merge.h | |
| parent | 92d19d16711c059c768063956abd31db346d2e7b (diff) | |
| download | libgit2-07fb67f90e79ecf35672008fed262a7db41d9790.tar.gz | |
merge: reverse array and length parameter order
Make it pair up with the one for commits. This fixes #1691.
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 3f21fb4c8..62fd7d723 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -85,15 +85,15 @@ GIT_EXTERN(int) git_merge_base( * * @param out the OID of a merge base considering all the commits * @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` + * @param input_array oids of the commits * @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); + size_t length, + const git_oid input_array[]); /** * Creates a `git_merge_head` from the given reference |