line-range.h: drop extern from function declaration
[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
9dd330e6 10#define RERERE_READONLY 04
cb6020bb 11
ac49f5ca
MZ
12/*
13 * Marks paths that have been hand-resolved and added to the
14 * index. Set in the util field of such paths after calling
15 * rerere_remaining.
16 */
17extern void *RERERE_RESOLVED;
18
1869bbe1 19struct rerere_dir;
1d51eced 20struct rerere_id {
1869bbe1 21 struct rerere_dir *collection;
a13d1370 22 int variant;
1d51eced
JH
23};
24
cb6020bb
JH
25extern int setup_rerere(struct string_list *, int);
26extern int rerere(int);
1d51eced
JH
27/*
28 * Given the conflict ID and the name of a "file" used for replaying
29 * the recorded resolution (e.g. "preimage", "postimage"), return the
30 * path to that filesystem entity. With "file" specified with NULL,
31 * return the path to the directory that houses these files.
32 */
33extern const char *rerere_path(const struct rerere_id *, const char *file);
01a10b0a 34extern int rerere_forget(struct pathspec *);
ac49f5ca 35extern int rerere_remaining(struct string_list *);
0f891e7d
JH
36extern void rerere_clear(struct string_list *);
37extern void rerere_gc(struct string_list *);
5b2fd956 38
cb6020bb 39#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
3424a022 40 N_("update the index with reused conflict resolution if possible"))
cb6020bb 41
5b2fd956 42#endif