aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-06-13 19:19:29 +0700
committerJunio C Hamano <gitster@pobox.com>2014-06-13 11:49:38 -0700
commit6c306a34eef49beb3db5500f6f29190c799ace4b (patch)
treea25dafcb898459059477becbac44450e69379704 /cache.h
parent782a5ff9cec21b6a4f1f09c80d646b27fb100559 (diff)
downloadgit-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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 31d4541bc..976f2e0c3 100644
--- a/cache.h
+++ b/cache.h
@@ -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;