diff options
| author | Vicent Martà <vicent@github.com> | 2012-10-30 12:03:22 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-10-30 12:03:22 -0700 |
| commit | c4a9ded0f9d8edd400cce0df5901af5b8c103147 (patch) | |
| tree | 9a97f2bfc849af8647fba05d03fb80dbacf456ec /include/git2 | |
| parent | 6c21358a89efe5d4b8c5ab26dd707500653ba911 (diff) | |
| parent | 31966d20e3fcfb7283884e477fbbaf0cffd81c37 (diff) | |
| download | libgit2-c4a9ded0f9d8edd400cce0df5901af5b8c103147.tar.gz | |
Merge pull request #1026 from nulltoken/repo/state
repo: enhance git_repository_state() detection
Diffstat (limited to 'include/git2')
| -rw-r--r-- | include/git2/repository.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/git2/repository.h b/include/git2/repository.h index d72431538..4d122265c 100644 --- a/include/git2/repository.h +++ b/include/git2/repository.h @@ -574,6 +574,12 @@ typedef enum { GIT_REPOSITORY_STATE_MERGE, GIT_REPOSITORY_STATE_REVERT, GIT_REPOSITORY_STATE_CHERRY_PICK, + GIT_REPOSITORY_STATE_BISECT, + GIT_REPOSITORY_STATE_REBASE, + GIT_REPOSITORY_STATE_REBASE_INTERACTIVE, + GIT_REPOSITORY_STATE_REBASE_MERGE, + GIT_REPOSITORY_STATE_APPLY_MAILBOX, + GIT_REPOSITORY_STATE_APPLY_MAILBOX_OR_REBASE, } git_repository_state_t; /** |