en/merge-ort-prepare-to-remove-recursive (Was: Re: What's cooking in git.git (Mar 2025, #03; Wed, 12))

[Elijah Newren <newren@xxxxxxxxx>]

On Wed, Mar 12, 2025 at 4:26 PM Junio C Hamano <gitster@xxxxxxxxx> wrote:


> * en/merge-ort-prepare-to-remove-recursive (2025-03-07) 3 commits
>  - merge-ort: support having merge verbosity be set to 0
>  - merge-ort: allow rename detection to be disabled
>  - merge-ort: add new merge_ort_generic() function
>
>  First step of deprecating and removing merge-recursive.
>
>  Will merge to 'next'.
>  source: <pull.1875.git.1741362522.gitgitgadget@xxxxxxxxx>


Can you hold off? Patrick and Taylor requested some changes, and I'm
about to submit v2.