Skip to main content

Browse the archive

Revision 1f2e64e22dee75db96b92d526d14003ba59a154e authored by Johannes Schindelin on 10 April 2024, 20:04:50 UTC, committed by Johannes Schindelin on 19 April 2024, 10:38:52 UTC 
Git 2.43.4
 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 8e97ec3
Raw File
resolve-undo.h 
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

struct cache_entry;
struct index_state;
struct pathspec;
struct string_list;

#include "hash-ll.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(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
void unmerge_index(struct index_state *, const struct pathspec *, unsigned);

#endif
back to top