Allow builtin-fetch to work on a detached HEAD

[git.git] / cache.h

diff --git a/cache.h b/cache.h
index 824650016677353cfa8c8a140eb3d904f56d60ee..16bdbb259168ff42ad68102bd012751139afa017 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -492,6 +492,7 @@ struct ref {
        unsigned char old_sha1[20];
        unsigned char new_sha1[20];
        unsigned char force;
+       unsigned char merge;
        struct ref *peer_ref; /* when renaming */
        char name[FLEX_ARRAY]; /* more */
 };