Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 29 lines (22 sloc) 0.829 kB
5b2fd95 @sbeyer rerere: Separate libgit and builtin functions
sbeyer authored
1 #ifndef RERERE_H
2 #define RERERE_H
3
c455c87 @dscho Rename path_list to string_list
dscho authored
4 #include "string-list.h"
5b2fd95 @sbeyer rerere: Separate libgit and builtin functions
sbeyer authored
5
cb6020b @gitster Teach --[no-]rerere-autoupdate option to merge, revert and friends
gitster authored
6 #define RERERE_AUTOUPDATE 01
7 #define RERERE_NOAUTOUPDATE 02
8
ac49f5c rerere "remaining"
Martin von Zweigbergk authored
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.
13 */
14 extern void *RERERE_RESOLVED;
15
cb6020b @gitster Teach --[no-]rerere-autoupdate option to merge, revert and friends
gitster authored
16 extern int setup_rerere(struct string_list *, int);
17 extern int rerere(int);
9005696 @szeder rerere: remove duplicated functions
szeder authored
18 extern const char *rerere_path(const char *hex, const char *file);
19 extern int has_rerere_resolution(const char *hex);
dea4562 @gitster rerere forget path: forget recorded resolution
gitster authored
20 extern int rerere_forget(const char **);
ac49f5c rerere "remaining"
Martin von Zweigbergk authored
21 extern int rerere_remaining(struct string_list *);
0f891e7 @gitster rerere: libify rerere_clear() and rerere_gc()
gitster authored
22 extern void rerere_clear(struct string_list *);
23 extern void rerere_gc(struct string_list *);
5b2fd95 @sbeyer rerere: Separate libgit and builtin functions
sbeyer authored
24
cb6020b @gitster Teach --[no-]rerere-autoupdate option to merge, revert and friends
gitster authored
25 #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \
26 "update the index with reused conflict resolution if possible")
27
5b2fd95 @sbeyer rerere: Separate libgit and builtin functions
sbeyer authored
28 #endif
Something went wrong with that request. Please try again.