rerere: call conflict-ids IDs
[git/git.git] / rerere.h
CommitLineData
5b2fd956
SB
1#ifndef RERERE_H
2#define RERERE_H
3
c455c87c 4#include "string-list.h"
5b2fd956 5
01a10b0a
NTND
6struct 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 */
16extern void *RERERE_RESOLVED;
17
cb6020bb
JH
18extern int setup_rerere(struct string_list *, int);
19extern int rerere(int);
18bb9934 20extern const char *rerere_path(const char *id, const char *file);
01a10b0a 21extern int rerere_forget(struct pathspec *);
ac49f5ca 22extern int rerere_remaining(struct string_list *);
0f891e7d
JH
23extern void rerere_clear(struct string_list *);
24extern void rerere_gc(struct string_list *);
5b2fd956 25
cb6020bb 26#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
3424a022 27 N_("update the index with reused conflict resolution if possible"))
cb6020bb 28
5b2fd956 29#endif