diff options
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -3,7 +3,16 @@ #include "string-list.h" -extern int setup_rerere(struct string_list *); -extern int rerere(void); +#define RERERE_AUTOUPDATE 01 +#define RERERE_NOAUTOUPDATE 02 + +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") #endif |