Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: 7a6a90c6ec48fc78c83d7090d6c1b95d8f3739c0 authored by Junio C Hamano on 08 January 2020, 20:43:54 UTC
Git 2.25-rc2
Tip revision: 7a6a90c
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