horok/git
1
0
Fork 0
Code Activity

Adding upstream version 1:2.47.2.

Browse source 
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
This commit is contained in:
Daniel Baumann 2025-06-23 07:43:39 +02:00
parent fd5a0bafa2
commit 54102a2c29
Signed by: daniel.baumann
GPG key ID: BCC918A2ABD66424
4535 changed files with 1510258 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
resolve-undo.h Normal file
View file

@ -0,0 +1,23 @@
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H
struct cache_entry;
struct index_state;
struct pathspec;
struct string_list;
#include "hash.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(struct index_state *, const char *, struct resolve_undo_info *, unsigned);
void unmerge_index(struct index_state *, const struct pathspec *, unsigned);
#endif