https://github.com/git/git
Raw File
Tip revision: fc14b89a7e6899b8ac3b5751ec2d8c98203ea4c2 authored by Junio C Hamano on 28 November 2011, 22:07:13 UTC
Git 1.7.8-rc4
Tip revision: fc14b89
resolve-undo.h
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

struct resolve_undo_info {
	unsigned int mode[3];
	unsigned char sha1[3][20];
};

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 char **);

#endif
back to top