Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision b91779f17eb19ffc2e63e84728e785cf274b47df authored by Junio C Hamano on 15 December 2010, 19:45:36 UTC, committed by Junio C Hamano on 15 December 2010, 19:45:36 UTC 
Git 1.7.2.5
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parent s 2850c1a + 9db41eb
Raw File
Tip revision: b91779f17eb19ffc2e63e84728e785cf274b47df authored by Junio C Hamano on 15 December 2010, 19:45:36 UTC
Git 1.7.2.5
Tip revision: b91779f
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