resolve-undo: "checkout -m path" uses resolve-undo information
[git/git.git] / resolve-undo.h
CommitLineData
cfc5789a
JH
1#ifndef RESOLVE_UNDO_H
2#define RESOLVE_UNDO_H
3
4struct resolve_undo_info {
5 unsigned int mode[3];
6 unsigned char sha1[3][20];
7};
8
9extern void record_resolve_undo(struct index_state *, struct cache_entry *);
10extern void resolve_undo_write(struct strbuf *, struct string_list *);
11extern struct string_list *resolve_undo_read(void *, unsigned long);
12extern void resolve_undo_clear_index(struct index_state *);
4421a823
JH
13extern int unmerge_index_entry_at(struct index_state *, int);
14extern void unmerge_index(struct index_state *, const char **);
cfc5789a
JH
15
16#endif