]>
Commit | Line | Data |
---|---|---|
cfc5789a JH |
1 | #ifndef RESOLVE_UNDO_H |
2 | #define RESOLVE_UNDO_H | |
3 | ||
ef3ca954 EN |
4 | #include "cache.h" |
5 | ||
cfc5789a JH |
6 | struct resolve_undo_info { |
7 | unsigned int mode[3]; | |
5ac913c6 | 8 | struct object_id oid[3]; |
cfc5789a JH |
9 | }; |
10 | ||
11 | extern void record_resolve_undo(struct index_state *, struct cache_entry *); | |
12 | extern void resolve_undo_write(struct strbuf *, struct string_list *); | |
b8bba419 | 13 | extern struct string_list *resolve_undo_read(const char *, unsigned long); |
cfc5789a | 14 | extern void resolve_undo_clear_index(struct index_state *); |
4421a823 | 15 | extern int unmerge_index_entry_at(struct index_state *, int); |
5ab06518 | 16 | extern void unmerge_index(struct index_state *, const struct pathspec *); |
e721c154 | 17 | extern void unmerge_marked_index(struct index_state *); |
cfc5789a JH |
18 | |
19 | #endif |