swh:1:snp:47f1e8bb459169b0feb652a9c3d9cbabd8526d4a
Raw File
Tip revision: 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 authored by Junio C Hamano on 16 August 2019, 17:28:23 UTC
Git 2.23
Tip revision: 5fa0f52
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];
};

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_at(struct index_state *, int);
void unmerge_index(struct index_state *, const struct pathspec *);
void unmerge_marked_index(struct index_state *);

#endif
back to top