gitweb: Add git_merge sub
[git/gsoc2010-gitweb.git] / rerere.h
blobeaa9004dcdbb2f0dfd446e1ac68237c6dff18530
1 #ifndef RERERE_H
2 #define RERERE_H
4 #include "string-list.h"
6 #define RERERE_AUTOUPDATE 01
7 #define RERERE_NOAUTOUPDATE 02
9 extern int setup_rerere(struct string_list *, int);
10 extern int rerere(int);
11 extern const char *rerere_path(const char *hex, const char *file);
12 extern int has_rerere_resolution(const char *hex);
13 extern int rerere_forget(const char **);
15 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
16 "update the index with reused conflict resolution if possible")
18 #endif