Merge branch 'jk/rebase-no-autostash' into maint

diff --git a/rerere.h b/rerere.h
index 2956c2edf2f0f88bd9fb15682e31e3478df44a03..407d59996d97ae307d5b4a124f78ef79666e1feb 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -7,6 +7,7 @@ struct pathspec;
 
 #define RERERE_AUTOUPDATE   01
 #define RERERE_NOAUTOUPDATE 02
+#define RERERE_READONLY     04
 
 /*
  * Marks paths that have been hand-resolved and added to the