| Message ID | 20201116102158.8365-11-alban.gruin@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Rewrite the remaining merge strategies from shell to C | expand |
diff --git a/builtin/merge.c b/builtin/merge.c index 3b35aa320c..f3345a582a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -744,6 +744,9 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common, } else if (!strcmp(strategy, "resolve")) { return merge_strategies_resolve(the_repository, common, head_arg, remoteheads); + } else if (!strcmp(strategy, "octopus")) { + return merge_strategies_octopus(the_repository, common, + head_arg, remoteheads); } else { return try_merge_command(the_repository, strategy, xopts_nr, xopts,
This teaches `git merge' to invoke the "octopus" strategy with a function call instead of forking. Signed-off-by: Alban Gruin <alban.gruin@gmail.com> --- builtin/merge.c | 3 +++ 1 file changed, 3 insertions(+)