Commit | Line | Data |
---|---|---|
5b2fd956 SB |
1 | #ifndef RERERE_H |
2 | #define RERERE_H | |
3 | ||
c455c87c | 4 | #include "string-list.h" |
5b2fd956 | 5 | |
01a10b0a NTND |
6 | struct pathspec; |
7 | ||
cb6020bb JH |
8 | #define RERERE_AUTOUPDATE 01 |
9 | #define RERERE_NOAUTOUPDATE 02 | |
10 | ||
ac49f5ca MZ |
11 | /* |
12 | * Marks paths that have been hand-resolved and added to the | |
13 | * index. Set in the util field of such paths after calling | |
14 | * rerere_remaining. | |
15 | */ | |
16 | extern void *RERERE_RESOLVED; | |
17 | ||
1d51eced JH |
18 | struct rerere_id { |
19 | char hex[41]; | |
20 | }; | |
21 | ||
cb6020bb JH |
22 | extern int setup_rerere(struct string_list *, int); |
23 | extern int rerere(int); | |
1d51eced JH |
24 | /* |
25 | * Given the conflict ID and the name of a "file" used for replaying | |
26 | * the recorded resolution (e.g. "preimage", "postimage"), return the | |
27 | * path to that filesystem entity. With "file" specified with NULL, | |
28 | * return the path to the directory that houses these files. | |
29 | */ | |
30 | extern const char *rerere_path(const struct rerere_id *, const char *file); | |
01a10b0a | 31 | extern int rerere_forget(struct pathspec *); |
ac49f5ca | 32 | extern int rerere_remaining(struct string_list *); |
0f891e7d JH |
33 | extern void rerere_clear(struct string_list *); |
34 | extern void rerere_gc(struct string_list *); | |
5b2fd956 | 35 | |
cb6020bb | 36 | #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ |
3424a022 | 37 | N_("update the index with reused conflict resolution if possible")) |
cb6020bb | 38 | |
5b2fd956 | 39 | #endif |