aboutsummaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-25 15:51:32 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-10 18:10:36 -0800
commitdea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69 (patch)
treebdcd9bf016f18206cb361aebb644e6ea9fe9c718 /rerere.h
parent27d6b08536838fff0e3568a57cc622ca1c39bf01 (diff)
downloadgit-dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69.tar.gz
git-dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69.tar.xz
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 <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
-rw-r--r--rerere.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/rerere.h b/rerere.h
index 13313f3f2..36560ff2f 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