| Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 1 | #ifndef RESOLVE_UNDO_H |
| 2 | #define RESOLVE_UNDO_H |
| 3 | |
| Elijah Newren | ef3ca95 | 2018-08-15 10:54:05 -0700 | [diff] [blame] | 4 | #include "cache.h" |
| 5 | |
| Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 6 | struct resolve_undo_info { |
| 7 | unsigned int mode[3]; |
| brian m. carlson | 5ac913c | 2018-03-12 02:27:25 +0000 | [diff] [blame] | 8 | struct object_id oid[3]; |
| Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 9 | }; |
| 10 | |
| Denton Liu | 5545442 | 2019-04-29 04:28:14 -0400 | [diff] [blame] | 11 | void record_resolve_undo(struct index_state *, struct cache_entry *); |
| 12 | void resolve_undo_write(struct strbuf *, struct string_list *); |
| 13 | struct string_list *resolve_undo_read(const char *, unsigned long); |
| 14 | void resolve_undo_clear_index(struct index_state *); |
| 15 | int unmerge_index_entry_at(struct index_state *, int); |
| 16 | void unmerge_index(struct index_state *, const struct pathspec *); |
| 17 | void unmerge_marked_index(struct index_state *); |
| Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 18 | |
| 19 | #endif |
