X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=rerere.h;h=eaa9004dcdbb2f0dfd446e1ac68237c6dff18530;hb=7e7db5e4520388d3a6f1efbe2f7a29d43bd06a2b;hp=13313f3f2b2cc6a8d895305b7ac92c12c1753682;hpb=b7380fa7a9adb52860eef7e8885fb8bc179beae1;p=git.git

diff --git a/rerere.h b/rerere.h
index 13313f3f2..eaa9004dc 100644
--- 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