From: Junio C Hamano Date: Wed, 15 Jan 2020 22:53:04 GMT Subject: Re: "rebase -ri" (was Re: Problems with ra/rebase-i-more-options - should we revert it?) Message-ID: In-Reply-To: Junio C Hamano writes: >> Having said that, if you ever find yourself wanting Just One Feature in >> `--rebase-merges` that would make it worthwhile for you to think about >> switching your patch-based workflow to a `rebase -ir`-based one, please >> let me know, and I will try my best to accommodate. I missed a mention of 'patch' here when I prepared my earlier reply. I do not expect "rebase -ri" to play any role in the part of the workflow that accepts patches from the mailing list. The involvement of "rebase -ri" (vs Meta/Reintegrate) is purely what happens after a topic is queued and starts to get tested with other topics on integration branches, and no "patch based workflow" plays any role there---it does not make any sense to base that part on anything but merge (and possibly cherry-picking an evil merge from an earlier round).