From 0f891e7d7eb54f9dca93dc3d462eb38082a3460f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 8 May 2011 12:55:34 -0700 Subject: rerere: libify rerere_clear() and rerere_gc() This moves the two features from builtin/rerere.c to a more library-ish portion of the codebase. No behaviour change. Signed-off-by: Junio C Hamano --- rerere.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'rerere.h') 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") -- cgit v1.2.1