From dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 25 Dec 2009 15:51:32 -0800 Subject: rerere forget path: forget recorded resolution After you find out an earlier resolution you told rerere to use was a mismerge, there is no easy way to clear it. A new subcommand "forget" can be used to tell git to forget a recorded resolution, so that you can redo the merge from scratch. Signed-off-by: Junio C Hamano --- rerere.h | 1 + 1 file changed, 1 insertion(+) (limited to 'rerere.h') diff --git a/rerere.h b/rerere.h index 13313f3f2b..36560ff2f5 100644 --- a/rerere.h +++ b/rerere.h @@ -7,5 +7,6 @@ extern int setup_rerere(struct string_list *); extern int rerere(void); 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 **); #endif -- cgit v1.2.3