diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-24 00:42:09 +0400 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-25 05:24:37 +0400 |
commit | 632d8b230bf38cc61cd70b55a54ae2f52502b4af (patch) | |
tree | 38a8c4825ab59511951b586edb434a5240f3dc9f /src/refs.h | |
parent | 6f6b0c013c6eff2aca2a7ada1027044f2e20f578 (diff) |
reset changes for merge
Diffstat (limited to 'src/refs.h')
-rw-r--r-- | src/refs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/refs.h b/src/refs.h index 54359f07b..58e2fd558 100644 --- a/src/refs.h +++ b/src/refs.h @@ -28,8 +28,11 @@ #define GIT_PACKEDREFS_FILE_MODE 0666 #define GIT_HEAD_FILE "HEAD" +#define GIT_ORIG_HEAD_FILE "ORIG_HEAD" #define GIT_FETCH_HEAD_FILE "FETCH_HEAD" #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_REFS_HEADS_MASTER_FILE GIT_REFS_HEADS_DIR "master" #define GIT_REFNAME_MAX 1024 |