Skip to main content

Browse the archive

Staging
v0.5.1
Revision 9db41eba4259126dbe1c68e2207d342d11f14745 authored by Junio C Hamano on 15 December 2010, 19:40:40 UTC, committed by Junio C Hamano on 15 December 2010, 19:40:40 UTC 
Git 1.7.1.4
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parent s bd01c6d + cb198b3
Raw File
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
back to top