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

17
merge.h Normal file
View file

@ -0,0 +1,17 @@
#ifndef MERGE_H
#define MERGE_H
struct commit_list;
struct object_id;
struct repository;
int try_merge_command(struct repository *r,
const char *strategy, size_t xopts_nr,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes);
int checkout_fast_forward(struct repository *r,
const struct object_id *from,
const struct object_id *to,
int overwrite_ignore);
#endif /* MERGE_H */