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 /cache.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 'cache.h')
| -rw-r--r-- | cache.h | 11 |
1 files changed, 0 insertions, 11 deletions
@@ -527,15 +527,4 @@ int add_files_to_cache(struct repository *repo, const char *prefix, void overlay_tree_on_index(struct index_state *istate, const char *tree_name, const char *prefix); -/* merge.c */ -struct commit_list; -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 /* CACHE_H */ |