Merge branch 'ds/default-pack-use-sparse-to-true'
[git.git] / resolve-undo.h
blob2b3f0f901e63aeab70dfca86d3067d169dc315e2
1 #ifndef RESOLVE_UNDO_H
2 #define RESOLVE_UNDO_H
4 #include "cache.h"
6 struct resolve_undo_info {
7 unsigned int mode[3];
8 struct object_id oid[3];
9 };
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 *);
19 #endif