Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 8a90438506d3b7c8ef8bd802b7ed10c1f12da1d0 authored by Junio C Hamano on 22 October 2010, 00:14:32 UTC
Git 1.7.3.2
Tip revision: 8a90438
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