1#ifndef RERERE_H 2#define RERERE_H 3 4#include "string-list.h" 5 6struct pathspec; 7 8#define RERERE_AUTOUPDATE 01 9#define RERERE_NOAUTOUPDATE 02 10 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 */ 16extern void *RERERE_RESOLVED; 17 18struct rerere_dir; 19struct rerere_id { 20 struct rerere_dir *collection; 21}; 22 23extern int setup_rerere(struct string_list *, int); 24extern int rerere(int); 25/* 26 * Given the conflict ID and the name of a "file" used for replaying 27 * the recorded resolution (e.g. "preimage", "postimage"), return the 28 * path to that filesystem entity. With "file" specified with NULL, 29 * return the path to the directory that houses these files. 30 */ 31extern const char *rerere_path(const struct rerere_id *, const char *file); 32extern int rerere_forget(struct pathspec *); 33extern int rerere_remaining(struct string_list *); 34extern void rerere_clear(struct string_list *); 35extern void rerere_gc(struct string_list *); 36 37#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ 38 N_("update the index with reused conflict resolution if possible")) 39 40#endif