Re: [PATCH v9 00/17] rebase -i: offer to recreate commit topology by rebasing merges

This has been sent by mistake, I'm sorry, please disregard. Sergey Organov writes: > Johannes Schindelin writes: > >> Junio, I think this is now ready for `next`. Thank you for your patience >> and help with this. [...]

Re: [PATCH v9 00/17] rebase -i: offer to recreate commit topology by rebasing merges

Johannes Schindelin writes: > Junio, I think this is now ready for `next`. Thank you for your patience > and help with this. > > Once upon a time, I dreamed of an interactive rebase that would not > linearize all patches and drop all merge commits, but instead

Re: [PATCH v9 00/17] rebase -i: offer to recreate commit topology by rebasing merges

Junio C Hamano writes: >> - Rebased the patch series on top of current `master`, i.e. both >> `pw/rebase-keep-empty-fixes` and `pw/rebase-signoff`, to resolve merge >> conflicts myself. > > Good to see the last item, as this gave me a chance to make sure > that the

Re: [PATCH v9 00/17] rebase -i: offer to recreate commit topology by rebasing merges

Johannes Schindelin writes: > Changes since v8: > > - Disentangled the patch introducing `label`/`reset` from the one > introducing `merge` again (this was one stupid, tired `git commit > --amend` too many). > > - Augmented the commit message of "introduce the

[PATCH v9 00/17] rebase -i: offer to recreate commit topology by rebasing merges

Junio, I think this is now ready for `next`. Thank you for your patience and help with this. Once upon a time, I dreamed of an interactive rebase that would not linearize all patches and drop all merge commits, but instead recreate the commit topology faithfully. My original attempt was