[thirdparty/git.git] / 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 */
Commit	Line	Data
750324dd EN	1	#ifndef MERGE_H
	2	#define MERGE_H
	3
	4	struct commit_list;
	5	struct object_id;
	6	struct repository;
	7
	8	int try_merge_command(struct repository *r,
	9	const char *strategy, size_t xopts_nr,
	10	const char *xopts, struct commit_list common,
	11	const char head_arg, struct commit_list remotes);
	12	int checkout_fast_forward(struct repository *r,
	13	const struct object_id *from,
	14	const struct object_id *to,
	15	int overwrite_ignore);
	16
	17	#endif /* MERGE_H */