Skip to main content

Browse the archive

Revision 1f2e64e22dee75db96b92d526d14003ba59a154e authored by Johannes Schindelin on 10 April 2024, 20:04:50 UTC, committed by Johannes Schindelin on 19 April 2024, 10:38:52 UTC 
Git 2.43.4
 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 8e97ec3
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