Skip to main content

Browse the archive

https://github.com/git/git
08 September 2024, 10:46:01 UTC
Revision 786a3e4b8d754d2b14b1208b98eeb0a554ef19a8 authored by Junio C Hamano on 29 April 2024, 14:30:29 UTC, committed by Junio C Hamano on 29 April 2024, 14:30:29 UTC 
Git 2.45
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f4edad9
Raw File
Tip revision: 786a3e4b8d754d2b14b1208b98eeb0a554ef19a8 authored by Junio C Hamano on 29 April 2024, 14:30:29 UTC
Git 2.45
Tip revision: 786a3e4
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