]> git.ipfire.org Git - thirdparty/git.git/blame - rerere.h
fetch: replace static buffer with xstrfmt
[thirdparty/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
cb6020bb
JH
19extern int setup_rerere(struct string_list *, int);
20extern int rerere(int);
90056966 21extern const char *rerere_path(const char *hex, const char *file);
01a10b0a 22extern int rerere_forget(struct pathspec *);
ac49f5ca 23extern int rerere_remaining(struct string_list *);
0f891e7d
JH
24extern void rerere_clear(struct string_list *);
25extern void rerere_gc(struct string_list *);
5b2fd956 26
cb6020bb 27#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
3424a022 28 N_("update the index with reused conflict resolution if possible"))
cb6020bb 29
5b2fd956 30#endif