[thirdparty/git.git] / rerere.h

#ifndef RERERE_H
#define RERERE_H

#include "string-list.h"

#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 has_rerere_resolution(const char *hex);
extern int rerere_forget(const char **);
extern int rerere_remaining(struct string_list *);

#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
	"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
cb6020bb JH	6	#define RERERE_AUTOUPDATE 01
	7	#define RERERE_NOAUTOUPDATE 02
	8
ac49f5ca MZ	9	/*
	10	* Marks paths that have been hand-resolved and added to the
	11	* index. Set in the util field of such paths after calling
	12	* rerere_remaining.
	13	*/
	14	extern void *RERERE_RESOLVED;
	15
cb6020bb JH	16	extern int setup_rerere(struct string_list *, int);
cb6020bb JH	17	extern int rerere(int);
90056966 SG	18	extern const char rerere_path(const char hex, const char *file);
90056966 SG	19	extern int has_rerere_resolution(const char *hex);
dea4562b	20	extern int rerere_forget(const char **);
ac49f5ca	21	extern int rerere_remaining(struct string_list *);
5b2fd956	22
cb6020bb JH	23	#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
	24	"update the index with reused conflict resolution if possible")
	25
5b2fd956	26	#endif