freshlybakedca.ke
Git fork
1#ifndef RESOLVE_UNDO_H
2#define RESOLVE_UNDO_H
3
4struct cache_entry;
5struct index_state;
6struct pathspec;
7struct string_list;
8
9#include "hash.h"
10
11struct resolve_undo_info {
12 unsigned int mode[3];
13 struct object_id oid[3];
14};
15
16void record_resolve_undo(struct index_state *, struct cache_entry *);
17void resolve_undo_write(struct strbuf *, struct string_list *,
18 const struct git_hash_algo *algop);
19struct string_list *resolve_undo_read(const char *, unsigned long,
20 const struct git_hash_algo *algop);
21void resolve_undo_clear_index(struct index_state *);
22int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
23void unmerge_index(struct index_state *, const struct pathspec *, unsigned);
24
25#endif