diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-03 13:57:17 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-03 13:57:17 -0800 |
| commit | b449a9ae8c9ac17652c5ab006859dd29b62a5b48 (patch) | |
| tree | 2426bf188ae68224a69e518e4b31eddfad92acc0 /include/git2/repository.h | |
| parent | 07871d3adcfdaba7ad5f99f89299258d1dbd92f9 (diff) | |
| parent | ad2bc32fa3e6958c2d975838712d6e3552abb838 (diff) | |
| download | libgit2-b449a9ae8c9ac17652c5ab006859dd29b62a5b48.tar.gz | |
Merge pull request #1185 from ethomson/cleanup_merge
expose merge metadata cleanup
Diffstat (limited to 'include/git2/repository.h')
| -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, |