Merge branch 'maint'

diff --git a/rerere.h b/rerere.h
index 13313f3f2b2cc6a8d895305b7ac92c12c1753682..eaa9004dcdbb2f0dfd446e1ac68237c6dff18530 100644 (file)
--- a/rerere.h
+++ b/rerere.h
@@ -3,9 +3,16 @@
 
 #include "string-list.h"
 
-extern int setup_rerere(struct string_list *);
-extern int rerere(void);
+#define RERERE_AUTOUPDATE   01
+#define RERERE_NOAUTOUPDATE 02
+
+extern int setup_rerere(struct string_list *, int);
+extern int rerere(int);
 extern const char *rerere_path(const char *hex, const char *file);
 extern int has_rerere_resolution(const char *hex);
+extern int rerere_forget(const char **);
+
+#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
+       "update the index with reused conflict resolution if possible")
 
 #endif