| Stephan Beyer | 5b2fd95 | 2008-07-09 14:58:57 +0200 | [diff] [blame] | 1 | #ifndef RERERE_H |
| 2 | #define RERERE_H |
| 3 | |
| Johannes Schindelin | c455c87 | 2008-07-21 19:03:49 +0100 | [diff] [blame] | 4 | #include "string-list.h" |
| Stephan Beyer | 5b2fd95 | 2008-07-09 14:58:57 +0200 | [diff] [blame] | 5 | |
| Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 6 | #define RERERE_AUTOUPDATE 01 |
| 7 | #define RERERE_NOAUTOUPDATE 02 |
| 8 | |
| Martin von Zweigbergk | ac49f5c | 2011-02-16 05:47:44 -0500 | [diff] [blame] | 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 | |
| Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 16 | extern int setup_rerere(struct string_list *, int); |
| 17 | extern int rerere(int); |
| SZEDER Gábor | 9005696 | 2009-02-14 23:21:04 +0100 | [diff] [blame] | 18 | extern const char *rerere_path(const char *hex, const char *file); |
| 19 | extern int has_rerere_resolution(const char *hex); |
| Junio C Hamano | dea4562 | 2009-12-25 15:51:32 -0800 | [diff] [blame] | 20 | extern int rerere_forget(const char **); |
| Martin von Zweigbergk | ac49f5c | 2011-02-16 05:47:44 -0500 | [diff] [blame] | 21 | extern int rerere_remaining(struct string_list *); |
| Stephan Beyer | 5b2fd95 | 2008-07-09 14:58:57 +0200 | [diff] [blame] | 22 | |
| Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 23 | #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ |
| 24 | "update the index with reused conflict resolution if possible") |
| 25 | |
| Stephan Beyer | 5b2fd95 | 2008-07-09 14:58:57 +0200 | [diff] [blame] | 26 | #endif |
