[thirdparty/git.git] / rerere.h

#ifndef RERERE_H
#define RERERE_H

#include "string-list.h"

struct pathspec;

#define RERERE_AUTOUPDATE   01
#define RERERE_NOAUTOUPDATE 02

/*
 * Marks paths that have been hand-resolved and added to the
 * index. Set in the util field of such paths after calling
 * rerere_remaining.
 */
extern void *RERERE_RESOLVED;

extern int setup_rerere(struct string_list *, int);
extern int rerere(int);
extern const char *rerere_path(const char *hex, const char *file);
extern int rerere_forget(struct pathspec *);
extern int rerere_remaining(struct string_list *);
extern void rerere_clear(struct string_list *);
extern void rerere_gc(struct string_list *);

#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
	N_("update the index with reused conflict resolution if possible"))

#endif
Commit	Line	Data
5b2fd956 SB	1	#ifndef RERERE_H
	2	#define RERERE_H
	3
c455c87c	4	#include "string-list.h"
5b2fd956	5
01a10b0a NTND	6	struct pathspec;
01a10b0a NTND	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	*/
	16	extern void *RERERE_RESOLVED;
	17
cb6020bb JH	18	extern int setup_rerere(struct string_list *, int);
cb6020bb JH	19	extern int rerere(int);
90056966	20	extern const char rerere_path(const char hex, const char *file);
01a10b0a	21	extern int rerere_forget(struct pathspec *);
ac49f5ca	22	extern int rerere_remaining(struct string_list *);
0f891e7d JH	23	extern void rerere_clear(struct string_list *);
0f891e7d JH	24	extern 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