X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=rerere.h;h=eaa9004dcdbb2f0dfd446e1ac68237c6dff18530;hb=547e8b9205349b47003ed25a82673e413e71c255;hp=10a94a4ea10aa4c7a1ba4ea8397b82f1278afc9d;hpb=c757c52f63cfaa9446f9ae93e44acc6ca610650f;p=thirdparty%2Fgit.git

diff --git a/rerere.h b/rerere.h
index 10a94a4ea1..eaa9004dcd 100644
--- a/rerere.h
+++ b/rerere.h
@@ -10,6 +10,7 @@ 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")