mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/ort-becomes-the-default'

Browse Source 
Use `ort` instead of `recursive` as the default merge strategy.

* en/ort-becomes-the-default:
  Update docs for change of default merge backend
  Change default merge backend from recursive to ort
This commit is contained in:
Junio C Hamano
2021-08-30 16:06:01 -07:00
parent aca13c2355 f5a3c5e637
commit 8778fa8b4f
8 changed files with 78 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sequencer.c
View File

@ -636,7 +636,7 @@ static int do_recursive_merge(struct repository *r,
for (i = 0; i < opts->xopts_nr; i++)
parse_merge_opt(&o, opts->xopts[i]);
if (opts->strategy && !strcmp(opts->strategy, "ort")) {
if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
memset(&result, 0, sizeof(result));
merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree,
&result);
@ -3988,7 +3988,7 @@ static int do_merge(struct repository *r,
o.branch2 = ref_name.buf;
o.buffer_output = 2;
if (opts->strategy && !strcmp(opts->strategy, "ort")) {
if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
/*
* TODO: Should use merge_incore_recursive() and
* merge_switch_to_result(), skipping the call to