Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 3e5524907b43337e82a24afbc822078daf7a868f authored by Junio C Hamano on 04 June 2018, 12:41:41 UTC
Git 2.18-rc1
Tip revision: 3e55249
resolve-undo.h
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

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

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