Skip to main content

Browse the archive

https://github.com/git/git
15 September 2024, 17:36:52 UTC
Revision 9a85b489d84c2a63de21fd16830d7f1b8628e6b8 authored by James Hill on 26 December 2019, 01:53:08 UTC, committed by GitHub on 26 December 2019, 01:53:08 UTC 
Update INSTALL
1 parent 99c33be
Raw File
Tip revision: 9a85b489d84c2a63de21fd16830d7f1b8628e6b8 authored by James Hill on 26 December 2019, 01:53:08 UTC
Update INSTALL
Tip revision: 9a85b48
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