French translation: copy -> copie.
[git/dscho.git] / rerere.h
blob156d2aad804527d5ae766b5381f3b5e0d2176580
1 #ifndef RERERE_H
2 #define RERERE_H
4 #include "string-list.h"
6 #define RERERE_AUTOUPDATE 01
7 #define RERERE_NOAUTOUPDATE 02
9 /*
10 * Marks paths that have been hand-resolved and added to the
11 * index. Set in the util field of such paths after calling
12 * rerere_remaining.
14 extern void *RERERE_RESOLVED;
16 extern int setup_rerere(struct string_list *, int);
17 extern int rerere(int);
18 extern const char *rerere_path(const char *hex, const char *file);
19 extern int rerere_forget(const char **);
20 extern int rerere_remaining(struct string_list *);
21 extern void rerere_clear(struct string_list *);
22 extern void rerere_gc(struct string_list *);
24 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
25 "update the index with reused conflict resolution if possible")
27 #endif