From: Junio C Hamano Date: Wed, 08 Jul 2026 01:02:12 GMT Subject: Re: [PATCH v7 0/3] Teach git-replay(1) to linearize merge commits Message-ID: In-Reply-To: <20260707-toon-git-replay-drop-merges-v7-0-808ab9b4afa6@iotcl.com> Toon Claes writes: > This series might conflict with Kristoffer's series to make > documentation changes[2], but should be trivial to resolve. And I don't > think there's a conflict with Patrick's series on adding "drop" to > git-history(1)[3]. > > dscho's series to replay merges[1] needs a bit of rework to fit on top > of this, but I'm happy to help figuring that out. We've been discussing > to either name the option --flatten or --linearize, but I've decided on > "linearize" because the documentation of git-rebase(1) also mentions > "linearize". > > [1]: > [2]: > [3]: <20260603-b4-pks-history-drop-v2-0-742cb5b5176d@pks.im> > > --- > Changes in v7: > - Allow --revert and --linearize to be used together. > - Because quite a lot of changes have been made since the original > patch, change author from Johannes to Toon for the last commit. > Johannes already told me he doesn't really care about authorship when > he initially shared the patch with me. Looks like all the previous review comments have been answered and the topic is in a good shape to be merged to 'next' (and allow us to polish incrementally as needed)? Thanks for working on the topic. Let me mark it for 'next'.