diff options
| author | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·36+0000 |
|---|---|---|
| committer | Vincent Ambo <Vincent Ambo> | 2020-01-11T23·40+0000 |
| commit | 7ef0d62730840ded097b524104cc0a0904591a63 (patch) | |
| tree | a670f96103667aeca4789a95d94ca0dff550c4ce /third_party/git/resolve-undo.h | |
| parent | 6a2a3007077818e24a3d56fc492ada9206a10cf0 (diff) | |
| parent | 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (diff) | |
merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'
Diffstat (limited to 'third_party/git/resolve-undo.h')
| -rw-r--r-- | third_party/git/resolve-undo.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/third_party/git/resolve-undo.h b/third_party/git/resolve-undo.h new file mode 100644 index 0000000000..2b3f0f901e --- /dev/null +++ b/third_party/git/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 |