Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 5d826e972970a784bd7a7bdf587512510097b8c7 authored by Junio C Hamano on 09 December 2018, 04:16:21 UTC, committed by Junio C Hamano on 09 December 2018, 04:16:21 UTC 
Git 2.20
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b5796d9
Raw File
Tip revision: 5d826e972970a784bd7a7bdf587512510097b8c7 authored by Junio C Hamano on 09 December 2018, 04:16:21 UTC
Git 2.20
Tip revision: 5d826e9
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];
};

extern void record_resolve_undo(struct index_state *, struct cache_entry *);
extern void resolve_undo_write(struct strbuf *, struct string_list *);
extern struct string_list *resolve_undo_read(const char *, unsigned long);
extern void resolve_undo_clear_index(struct index_state *);
extern int unmerge_index_entry_at(struct index_state *, int);
extern void unmerge_index(struct index_state *, const struct pathspec *);
extern void unmerge_marked_index(struct index_state *);

#endif
back to top