Hi Junio, On Mon, 28 Jan 2019, Junio C Hamano wrote: > * en/rebase-merge-on-sequencer (2019-01-07) 8 commits > - rebase: implement --merge via the interactive machinery > - rebase: define linearization ordering and enforce it > - git-legacy-rebase: simplify unnecessary triply-nested if > - git-rebase, sequencer: extend --quiet option for the interactive machinery > - am, rebase--merge: do not overlook --skip'ed commits with post-rewrite > - t5407: add a test demonstrating how interactive handles --skip differently > - rebase: fix incompatible options error message > - rebase: make builtin and legacy script error messages the same > > "git rebase --merge" as been reimplemented by reusing the internal > machinery used for "git rebase -i". > > On hold. > cf. <CABPp-BFckuONYcGGkCY3BuPypRULmhsk_OFHyYA2E4jM66BfeQ@xxxxxxxxxxxxxx> Wasn't this resolved by you mentioning that you trust rerere, in <xmqqmunxluj8.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx>? In any case, please note that v5 was submitted: https://public-inbox.org/git/20190129013945.17336-1-newren@xxxxxxxxx/#r Ciao, Dscho
