[thirdparty/git.git] / rerere.h

#ifndef RERERE_H
#define RERERE_H

#include "string-list.h"

#define RERERE_AUTOUPDATE   01
#define RERERE_NOAUTOUPDATE 02

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 **);

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

#endif
Commit	Line	Data
	1	#ifndef RERERE_H
	2	#define RERERE_H
	3
	4	#include "string-list.h"
	5
	6	#define RERERE_AUTOUPDATE 01
	7	#define RERERE_NOAUTOUPDATE 02
	8
	9	extern int setup_rerere(struct string_list *, int);
	10	extern int rerere(int);
	11	extern const char rerere_path(const char hex, const char *file);
	12	extern int has_rerere_resolution(const char *hex);
	13	extern int rerere_forget(const char **);
	14
	15	#define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
	16	"update the index with reused conflict resolution if possible")
	17
	18	#endif