Skip to main content

Browse the archive

https://github.com/git/git
22 May 2024, 15:28:21 UTC
Revision ada6a4117eb204fe14a83bc51daaf923cd8127ec authored by Junio C Hamano on 14 December 2010, 15:51:35 UTC, committed by Junio C Hamano on 14 December 2010, 16:55:52 UTC 
Prepare for 1.7.3.4
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 3055d78
Raw File
Tip revision: ada6a4117eb204fe14a83bc51daaf923cd8127ec authored by Junio C Hamano on 14 December 2010, 15:51:35 UTC
Prepare for 1.7.3.4
Tip revision: ada6a41
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