Permalink
Cannot retrieve contributors at this time
Switch branches/tags
v2.14.0-rc1
v2.14.0-rc0
v2.13.3
v2.13.2
v2.13.1
v2.13.0
v2.13.0-rc2
v2.13.0-rc1
v2.13.0-rc0
v2.12.3
v2.12.2
v2.12.1
v2.12.0
v2.12.0-rc2
v2.12.0-rc1
v2.12.0-rc0
v2.11.2
v2.11.1
v2.11.0
v2.11.0-rc3
v2.11.0-rc2
v2.11.0-rc1
v2.11.0-rc0
v2.10.3
v2.10.2
v2.10.1
v2.10.0
v2.10.0-rc2
v2.10.0-rc1
v2.10.0-rc0
v2.9.4
v2.9.3
v2.9.2
v2.9.1
v2.9.0
v2.9.0-rc2
v2.9.0-rc1
v2.9.0-rc0
v2.8.5
v2.8.4
v2.8.3
v2.8.2
v2.8.1
v2.8.0
v2.8.0-rc4
v2.8.0-rc3
v2.8.0-rc2
v2.8.0-rc1
v2.8.0-rc0
v2.7.5
v2.7.4
v2.7.3
v2.7.2
v2.7.1
v2.7.0
v2.7.0-rc3
v2.7.0-rc2
v2.7.0-rc1
v2.7.0-rc0
v2.6.7
v2.6.6
v2.6.5
v2.6.4
v2.6.3
v2.6.2
v2.6.1
v2.6.0
v2.6.0-rc3
v2.6.0-rc2
v2.6.0-rc1
v2.6.0-rc0
v2.5.6
v2.5.5
v2.5.4
v2.5.3
v2.5.2
v2.5.1
v2.5.0
v2.5.0-rc3
v2.5.0-rc2
v2.5.0-rc1
v2.5.0-rc0
v2.4.12
v2.4.11
v2.4.10
v2.4.9
v2.4.8
v2.4.7
v2.4.6
v2.4.5
v2.4.4
v2.4.3
v2.4.2
v2.4.1
v2.4.0
v2.4.0-rc3
v2.4.0-rc2
v2.4.0-rc1
v2.4.0-rc0
v2.3.10
Nothing to show
git/resolve-undo.h
Fetching contributors…
Cannot retrieve contributors at this time
| #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 |