]>
Commit | Line | Data |
---|---|---|
5b2fd956 SB |
1 | #ifndef RERERE_H |
2 | #define RERERE_H | |
3 | ||
c455c87c | 4 | #include "string-list.h" |
5b2fd956 | 5 | |
cb6020bb JH |
6 | #define RERERE_AUTOUPDATE 01 |
7 | #define RERERE_NOAUTOUPDATE 02 | |
8 | ||
9 | extern int setup_rerere(struct string_list *, int); | |
10 | extern int rerere(int); | |
90056966 SG |
11 | extern const char *rerere_path(const char *hex, const char *file); |
12 | extern int has_rerere_resolution(const char *hex); | |
dea4562b | 13 | extern int rerere_forget(const char **); |
5b2fd956 | 14 | |
cb6020bb JH |
15 | #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ |
16 | "update the index with reused conflict resolution if possible") | |
17 | ||
5b2fd956 | 18 | #endif |