From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Jan 2021 07:33:44 +0000 (-0800)
Subject: Merge branch 'en/merge-ort-recursive'
X-Git-Tag: v2.31.0-rc0~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45a177069f1ed9f56ab13cd34c654ecc5376945b;p=thirdparty%2Fgit.git

Merge branch 'en/merge-ort-recursive'

The ORT merge strategy learned to synthesize virtual ancestor tree
by recursively merging multiple merge bases together, just like the
recursive backend has done for years.

* en/merge-ort-recursive:
  merge-ort: implement merge_incore_recursive()
  merge-ort: make clear_internal_opts() aware of partial clearing
  merge-ort: copy a few small helper functions from merge-recursive.c
  commit: move reverse_commit_list() from merge-recursive
---

45a177069f1ed9f56ab13cd34c654ecc5376945b