X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.h;h=595f49f701dc1003927679085ca6eea8ad1083ae;hb=b57fb80a7d7d19102b31ab94a28ed43ea1ee07bb;hp=eaa9004dcdbb2f0dfd446e1ac68237c6dff18530;hpb=919451330b55366ac207e575c1982bc8fa5220ed;p=git.git

diff --git a/rerere.h b/rerere.h
index eaa9004dc..595f49f70 100644
--- a/rerere.h
+++ b/rerere.h
@@ -6,11 +6,19 @@
 #define RERERE_AUTOUPDATE   01
 #define RERERE_NOAUTOUPDATE 02
 
+/*
+ * Marks paths that have been hand-resolved and added to the
+ * index. Set in the util field of such paths after calling
+ * rerere_remaining.
+ */
+extern void *RERERE_RESOLVED;
+
 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 **);
+extern int rerere_remaining(struct string_list *);
 
 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
 	"update the index with reused conflict resolution if possible")