X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=rerere.h;h=fcd8bc10ba587d023d174d68020a185eab0f8d40;hb=c9d8f0ac3b9029d825c7d1c049953aacbc489e1c;hp=595f49f701dc1003927679085ca6eea8ad1083ae;hpb=99ac63b092f592b7181f94b6479f3a24dbfc8fdb;p=git.git

diff --git a/rerere.h b/rerere.h
index 595f49f70..fcd8bc10b 100644
--- a/rerere.h
+++ b/rerere.h
@@ -19,6 +19,8 @@ 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 *);
+extern void rerere_clear(struct string_list *);
+extern void rerere_gc(struct string_list *);
 
 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
 	"update the index with reused conflict resolution if possible")