Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision 2d755dfac9aadab25c3e025b849252b8c0a61465 authored by Junio C Hamano on 06 August 2021, 19:53:06 UTC, committed by Junio C Hamano on 06 August 2021, 19:53:06 UTC 
Git 2.33-rc1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent aa7d2fe
Raw File
Tip revision: 2d755dfac9aadab25c3e025b849252b8c0a61465 authored by Junio C Hamano on 06 August 2021, 19:53:06 UTC
Git 2.33-rc1
Tip revision: 2d755df
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