Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 4843cdefe3f30d19c1b2cf601522152c1413459a authored by Junio C Hamano on 19 October 2017, 05:49:17 UTC
Git 2.15-rc2
Tip revision: 4843cde
resolve-undo.h
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

struct resolve_undo_info {
	unsigned int mode[3];
	unsigned char sha1[3][20];
};

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

#endif
back to top