| 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 | |
| Nguyễn Thái Ngọc Duy | 01a10b0 | 2013-07-14 15:35:40 +0700 | [diff] [blame] | 6 | struct pathspec; |
| 7 | |
| Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 8 | #define RERERE_AUTOUPDATE 01 |
| 9 | #define RERERE_NOAUTOUPDATE 02 |
| 10 | |
| Martin von Zweigbergk | ac49f5c | 2011-02-16 05:47:44 -0500 | [diff] [blame] | 11 | /* |
| 12 | * Marks paths that have been hand-resolved and added to the |
| 13 | * index. Set in the util field of such paths after calling |
| 14 | * rerere_remaining. |
| 15 | */ |
| 16 | extern void *RERERE_RESOLVED; |
| 17 | |
| Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 18 | extern int setup_rerere(struct string_list *, int); |
| 19 | extern int rerere(int); |
| SZEDER Gábor | 9005696 | 2009-02-14 23:21:04 +0100 | [diff] [blame] | 20 | extern const char *rerere_path(const char *hex, const char *file); |
| Nguyễn Thái Ngọc Duy | 01a10b0 | 2013-07-14 15:35:40 +0700 | [diff] [blame] | 21 | extern int rerere_forget(struct pathspec *); |
| Martin von Zweigbergk | ac49f5c | 2011-02-16 05:47:44 -0500 | [diff] [blame] | 22 | extern int rerere_remaining(struct string_list *); |
| Junio C Hamano | 0f891e7 | 2011-05-08 12:55:34 -0700 | [diff] [blame] | 23 | extern void rerere_clear(struct string_list *); |
| 24 | extern void rerere_gc(struct string_list *); |
| Stephan Beyer | 5b2fd95 | 2008-07-09 14:58:57 +0200 | [diff] [blame] | 25 | |
| Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 26 | #define OPT_RERERE_AUTOUPDATE(v) OPT_UYN(0, "rerere-autoupdate", (v), \ |
| Matthias Ruester | 3424a02 | 2014-09-15 00:40:53 +0200 | [diff] [blame] | 27 | N_("update the index with reused conflict resolution if possible")) |
| Junio C Hamano | cb6020b | 2009-12-04 00:20:48 -0800 | [diff] [blame] | 28 | |
| Stephan Beyer | 5b2fd95 | 2008-07-09 14:58:57 +0200 | [diff] [blame] | 29 | #endif |
