| | 1 | #ifndef RESOLVE_UNDO_H |
| | 2 | #define RESOLVE_UNDO_H |
| | 3 | |
| | 4 | #include "cache.h" |
| | 5 | |
| | 6 | struct resolve_undo_info { |
| | 7 | unsigned int mode[3]; |
| | 8 | struct object_id oid[3]; |
| | 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 *); |
| | 13 | extern struct string_list *resolve_undo_read(const char *, unsigned long); |
| | 14 | extern void resolve_undo_clear_index(struct index_state *); |
| | 15 | extern int unmerge_index_entry_at(struct index_state *, int); |
| | 16 | extern void unmerge_index(struct index_state *, const struct pathspec *); |
| | 17 | extern void unmerge_marked_index(struct index_state *); |
| | 18 | |
| | 19 | #endif |
/ uis / git / x / uis / git / git.git / blame_incremental