tc/replay-linearize [Was: Re: What's cooking in git.git (Jul 2026, #05)]
On Sun, Jul 12, 2026 at 10:40 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 12 quoted lines
>
> * tc/replay-linearize (2026-07-07) 3 commits
> (merged to 'next' on 2026-07-09 at 371c2e9c3b)
> + replay: offer an option to linearize the commit topology
> + replay: resolve the replay base outside pick_regular_commit()
> + replay: add helper to put entry into replayed_commits
>
> The 'git replay' command has been taught the '--linearize' option to
> drop merge commits and linearize the replayed history, mimicking 'git
> rebase --no-rebase-merges'.
>
> Will merge to 'master'.
Could we hold off on that until there's a response to
<CABPp-BGzU9KHGF1nipi2HZaa1AiikMKGGaapQzHVH06wO4V1ww@mail.gmail.com> ?
I think the third patch has a pretty serious principle of least
astonishment violation, and there's two alternatives that weren't
previously considered -- one of which would be simple to implement.