git/resolve-undo.c

#define USE_THE_REPOSITORY_VARIABLE

#include "git-compat-util.h"
#include "dir.h"
#include "hash.h"
#include "read-cache.h"
#include "resolve-undo.h"
#include "sparse-index.h"
#include "string-list.h"

/* The only error case is to run out of memory in string-list */
void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
{ … }

void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
{ … }

struct string_list *resolve_undo_read(const char *data, unsigned long size)
{ … }

void resolve_undo_clear_index(struct index_state *istate)
{ … }

int unmerge_index_entry(struct index_state *istate, const char *path,
			struct resolve_undo_info *ru, unsigned ce_flags)
{ … }

void unmerge_index(struct index_state *istate, const struct pathspec *pathspec,
		   unsigned ce_flags)
{ … }