diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-06-13 19:19:29 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-06-13 11:49:38 -0700 |
commit | 6c306a34eef49beb3db5500f6f29190c799ace4b (patch) | |
tree | a25dafcb898459059477becbac44450e69379704 /cache.h | |
parent | 782a5ff9cec21b6a4f1f09c80d646b27fb100559 (diff) | |
download | git-6c306a34eef49beb3db5500f6f29190c799ace4b.tar.gz git-6c306a34eef49beb3db5500f6f29190c799ace4b.tar.xz |
resolve-undo: be specific what part of the index has changed
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -272,6 +272,7 @@ static inline unsigned int canon_mode(unsigned int mode) #define CE_ENTRY_CHANGED (1 << 1) #define CE_ENTRY_REMOVED (1 << 2) #define CE_ENTRY_ADDED (1 << 3) +#define RESOLVE_UNDO_CHANGED (1 << 4) struct index_state { struct cache_entry **cache; |