Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
Revision 7c36a4577d2d62b711ceadb5e7d964349b8dfc4d authored by Adolfo on 27 November 2017, 00:47:21 UTC, committed by Adolfo on 27 November 2017, 00:47:21 UTC 
Fix Spanish translation
1 parent 14c63a9
Raw File
Tip revision: 7c36a4577d2d62b711ceadb5e7d964349b8dfc4d authored by Adolfo on 27 November 2017, 00:47:21 UTC
Fix Spanish translation
Tip revision: 7c36a45
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 struct pathspec *);
extern void unmerge_marked_index(struct index_state *);

#endif
back to top