diff options
| author | punkymaniac <punkymaniac@protonmail.ch> | 2021-11-26 15:14:56 +0100 |
|---|---|---|
| committer | punkymaniac <punkymaniac@protonmail.ch> | 2022-01-09 10:17:51 +0100 |
| commit | 68bc511abb8574b843209685e0f05a88856d7ecf (patch) | |
| tree | 33a6b33ea5a25faa708f999a489def55777d3df9 /include/git2/merge.h | |
| parent | 03aed8bca7473c51148e5fdf8a258bc57f452a85 (diff) | |
| download | libgit2-68bc511abb8574b843209685e0f05a88856d7ecf.tar.gz | |
Add documentation about parameter and return value
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index e32c53fcc..3b3132f26 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -372,6 +372,7 @@ typedef enum { * merging them into the HEAD of the repository. * * @param analysis_out analysis enumeration that the result is written into + * @param preference_out One of the `git_merge_preference_t` flag. * @param repo the repository to merge * @param their_heads the heads to merge into * @param their_heads_len the number of heads to merge @@ -389,6 +390,7 @@ GIT_EXTERN(int) git_merge_analysis( * merging them into a reference. * * @param analysis_out analysis enumeration that the result is written into + * @param preference_out One of the `git_merge_preference_t` flag. * @param repo the repository to merge * @param our_ref the reference to perform the analysis from * @param their_heads the heads to merge into |