Skip to main content

Browse the archive

Staging
v0.5.1
Revision adf872e7837cc92e390f00ee32f32c5639d3a444 authored by Junio C Hamano on 13 January 2011, 19:42:01 UTC, committed by Junio C Hamano on 13 January 2011, 20:14:18 UTC 
Git 1.7.4-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 477039c
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