Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 26aa9fc81d4c7f6c3b456a29da0b7ec72e5c6595 authored by Junio C Hamano on 18 November 2018, 09:24:49 UTC
Git 2.20-rc0
Tip revision: 26aa9fc
resolve-undo.h
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

#include "cache.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