diff options
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/repository.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/git2/repository.h b/include/git2/repository.h index 96b47f440..02e689111 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -490,6 +490,15 @@ GIT_EXTERN(int) git_repository_message(char *out, size_t len, git_repository *re */ GIT_EXTERN(int) git_repository_message_remove(git_repository *repo); +/** + * Remove all the metadata associated with an ongoing git merge, including + * MERGE_HEAD, MERGE_MSG, etc. + * + * @param repo A repository object + * @return 0 on success, or error + */ +GIT_EXTERN(int) git_repository_merge_cleanup(git_repository *repo); + typedef int (*git_repository_fetchhead_foreach_cb)(const char *ref_name, const char *remote_url, const git_oid *oid, |