Skip to main content

Browse the archive

Revision f41f85c9ec8d4d46de0fd5fded88db94d3ec8c11 authored by Junio C Hamano on 20 February 2024, 05:01:01 UTC, committed by Junio C Hamano on 20 February 2024, 05:01:01 UTC 
Git 2.44-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 58aa645
Raw File
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