diff options
| author | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
|---|---|---|
| committer | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
| commit | 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (patch) | |
| tree | e3accb9beed5c4c1b5a05c99db71ab2841f0ed04 /resolve-undo.h | |
Squashed 'third_party/git/' content from commit cb71568594
git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/resolve-undo.h b/resolve-undo.h new file mode 100644 index 000000000000..2b3f0f901e63 --- /dev/null +++ b/resolve-undo.h @@ -0,0 +1,19 @@ +#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 |