Skip to main content

Browse the archive

https://github.com/git/git
23 July 2024, 09:13:25 UTC
Revision ac83bc5054c2ac489166072334b4147ce6d0fccb authored by Junio C Hamano on 04 August 2023, 17:01:45 UTC, committed by Junio C Hamano on 04 August 2023, 17:52:31 UTC 
Git 2.42-rc0
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 65e25ae
Raw File
Tip revision: ac83bc5054c2ac489166072334b4147ce6d0fccb authored by Junio C Hamano on 04 August 2023, 17:01:45 UTC
Git 2.42-rc0
Tip revision: ac83bc5
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_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