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 /src/refs.h | |
| 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 'src/refs.h')
| -rw-r--r-- | src/refs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/refs.h b/src/refs.h index 7b6f9611a..a58bebd0d 100644 --- a/src/refs.h +++ b/src/refs.h @@ -33,6 +33,12 @@ #define GIT_MERGE_HEAD_FILE "MERGE_HEAD" #define GIT_REVERT_HEAD_FILE "REVERT_HEAD" #define GIT_CHERRY_PICK_HEAD_FILE "CHERRY_PICK_HEAD" +#define GIT_BISECT_LOG_FILE "BISECT_LOG" +#define GIT_REBASE_MERGE_DIR "rebase-merge/" +#define GIT_REBASE_MERGE_INTERACTIVE_FILE GIT_REBASE_MERGE_DIR "interactive" +#define GIT_REBASE_APPLY_DIR "rebase-apply/" +#define GIT_REBASE_APPLY_REBASING_FILE GIT_REBASE_APPLY_DIR "rebasing" +#define GIT_REBASE_APPLY_APPLYING_FILE GIT_REBASE_APPLY_DIR "applying" #define GIT_REFS_HEADS_MASTER_FILE GIT_REFS_HEADS_DIR "master" #define GIT_STASH_FILE "stash" |