Permalink
Cannot retrieve contributors at this time
Name already in use
A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?
git/resolve-undo.h
Go to fileThis commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
17 lines (14 sloc)
612 Bytes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #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 |