resolve-undo.h · leroysheep/MovieWebApp

seen

h 25 lines 746 Bytes

Raw

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