Revision 492b10766f499b60bdc867c253f36d274ac51538 authored by Junio C Hamano on 27 June 2010, 19:01:12 UTC, committed by Junio C Hamano on 27 June 2010, 19:16:06 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent cf4403a
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
Computing file changes ...
