From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 02 Feb 2022 22:01:12 GMT
Subject: Re: [PATCH v3 04/15] merge-tree: implement real merges
Message-ID: <xmqqh79hvsgn.fsf@gitster.g>
In-Reply-To: <CABPp-BGpD6g5QH3=4X_dCuSX0Bs0utHn5hyuU4_UiwNhU0h8sg@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> Yes, you are reading right.  I think the cherry-pick/rebase
> replacement actually deserves a separate command from what merges
> should use; replaying a sequence of commits just has a number of UI
> differences and abilities that I think pull it in a different
> direction.

I completely disagree.  Each individual step in a sequence of
replaying commits in order (or in reverse order) should be
scriptable as a single merge-tree that takes "apply the change to go
from A^ to A on X".  Sequencing and placing UI around it is a job
for the script that drives merge-tree.