https://github.com/git/git
Raw File
Tip revision: 564d0252ca632e0264ed670534a51d18a689ef5d authored by Junio C Hamano on 19 November 2023, 23:47:38 UTC
Git 2.43
Tip revision: 564d025
merge.h
#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 */
back to top