Skip to main content

Browse the archive

Staging
v0.5.1
Revision d98273ba77e1ab9ec755576bc86c716a97bf59d7 authored by Junio C Hamano on 05 October 2020, 21:00:04 UTC, committed by Junio C Hamano on 05 October 2020, 21:01:56 UTC 
Git 2.29-rc0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 542b3c2
Raw File
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