mirror of
https://github.com/git/git
synced 2024-11-05 04:53:18 +00:00
750324ddb8
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
17 lines
446 B
C
17 lines
446 B
C
#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 */
|