projects / thirdparty / git.git / blame
| 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 | ||
| ac49f5ca MZ |
9 | /* |
| 10 | * Marks paths that have been hand-resolved and added to the | |
| 11 | * index. Set in the util field of such paths after calling | |
| 12 | * rerere_remaining. | |
| 13 | */ | |
| 14 | extern void *RERERE_RESOLVED; | |
| 15 | ||
| cb6020bb JH |
16 | extern int setup_rerere(struct string_list *, int); |
| 17 | extern int rerere(int); | |
| 90056966 | 18 | extern const char *rerere_path(const char *hex, const char *file); |
| dea4562b | 19 | extern int rerere_forget(const char **); |
| ac49f5ca | 20 | extern int rerere_remaining(struct string_list *); |
| 0f891e7d JH |
21 | extern void rerere_clear(struct string_list *); |
| 22 | extern void rerere_gc(struct string_list *); | |
| 5b2fd956 | 23 | |
| cb6020bb JH |
24 | #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ |
| 25 | "update the index with reused conflict resolution if possible") | |
| 26 | ||
| 5b2fd956 | 27 | #endif |