diff options
| author | Elijah Newren <newren@gmail.com> | 2023-05-16 09:33:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-21 23:39:53 +0300 |
| commit | 750324ddb876b54f52578df26278bf99c1e51eb9 (patch) | |
| tree | d3d8e94b02b80bedab684d6d9402f42b710fa14f /merge.h | |
| parent | eaa966db798ca8b0313396f11fe7edfa78c2ddae (diff) | |
merge.h: move declarations for merge.c from cache.h
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.h')
| -rw-r--r-- | merge.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/merge.h b/merge.h new file mode 100644 index 0000000000..21ac7ef2f1 --- /dev/null +++ b/merge.h @@ -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 */ |