diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-11-22 18:02:12 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-12-02 16:57:41 -0600 |
| commit | bab0b9f2d21d993c3f25ee00ce2d243a4dc0de93 (patch) | |
| tree | 57e11cab3b255a3fb8a46b00601504a002702f42 /include/git2/repository.h | |
| parent | 300d192f7ed45112121f2a35d5ca80a4913c7aad (diff) | |
| download | libgit2-bab0b9f2d21d993c3f25ee00ce2d243a4dc0de93.tar.gz | |
clean up state metadata more consistently
Diffstat (limited to 'include/git2/repository.h')
| -rw-r--r-- | include/git2/repository.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/git2/repository.h b/include/git2/repository.h index b4d561992..c6bd4dca4 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -488,13 +488,13 @@ 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. + * Remove all the metadata associated with an ongoing command like merge, + * revert, cherry-pick, etc. For example: 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); +GIT_EXTERN(int) git_repository_state_cleanup(git_repository *repo); typedef int (*git_repository_fetchhead_foreach_cb)(const char *ref_name, const char *remote_url, |