diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:49:36 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:49:36 +0000 |
commit | 5ec6074f0633939fd17d94111d10c6c6b062978c (patch) | |
tree | bfaa17b5a64abc66c918e9c70969e519d9e1df8e /resolve-undo.h | |
parent | Initial commit. (diff) | |
download | git-5ec6074f0633939fd17d94111d10c6c6b062978c.tar.xz git-5ec6074f0633939fd17d94111d10c6c6b062978c.zip |
Adding upstream version 1:2.30.2.upstream/1%2.30.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
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 0000000..2b3f0f9 --- /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 |