resolve-undo.h 630 Bytes
Newer Older
1 2 3
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

4 5
#include "cache.h"

6 7
struct resolve_undo_info {
	unsigned int mode[3];
8
	struct object_id oid[3];
9 10 11 12
};

extern void record_resolve_undo(struct index_state *, struct cache_entry *);
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