diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-08 12:55:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-08 12:55:34 -0700 |
| commit | 0f891e7d7eb54f9dca93dc3d462eb38082a3460f (patch) | |
| tree | 7b8a6e3c8d6ad56659f8183274a82c83d0600a98 /rerere.h | |
| parent | 9db19414582fdb154384ff1ca457cbf9095fef48 (diff) | |
| download | git-0f891e7d7eb54f9dca93dc3d462eb38082a3460f.tar.gz | |
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 <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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") |