[thirdparty/git.git] / resolve-undo.h

#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

struct cache_entry;
struct index_state;
struct pathspec;
struct string_list;

#include "hash-ll.h"

struct resolve_undo_info {
	unsigned int mode[3];
	struct object_id oid[3];
};

void record_resolve_undo(struct index_state *, struct cache_entry *);
void resolve_undo_write(struct strbuf *, struct string_list *);
struct string_list *resolve_undo_read(const char *, unsigned long);
void resolve_undo_clear_index(struct index_state *);
int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
void unmerge_index(struct index_state *, const struct pathspec *, unsigned);

#endif
Commit	Line	Data
cfc5789a JH	1	#ifndef RESOLVE_UNDO_H
	2	#define RESOLVE_UNDO_H
	3
b7b189cd EN	4	struct cache_entry;
	5	struct index_state;
	6	struct pathspec;
	7	struct string_list;
	8
d1cbe1e6	9	#include "hash-ll.h"
ef3ca954	10
cfc5789a JH	11	struct resolve_undo_info {
cfc5789a JH	12	unsigned int mode[3];
5ac913c6	13	struct object_id oid[3];
cfc5789a JH	14	};
cfc5789a JH	15
55454427 DL	16	void record_resolve_undo(struct index_state , struct cache_entry );
	17	void resolve_undo_write(struct strbuf , struct string_list );
	18	struct string_list resolve_undo_read(const char , unsigned long);
	19	void resolve_undo_clear_index(struct index_state *);
5bdedac3 JH	20	int unmerge_index_entry(struct index_state , const char , struct resolve_undo_info *, unsigned);
5bdedac3 JH	21	void unmerge_index(struct index_state , const struct pathspec , unsigned);
cfc5789a JH	22
cfc5789a JH	23	#endif