Re: [PATCH v4 00/12] rebase -i: offer to recreate merge commits

Hi Jake, On Sun, 25 Feb 2018, Jacob Keller wrote: > On Fri, Feb 23, 2018 at 4:35 AM, Johannes Schindelin > wrote: > > Changes since v3: > > > > - fixed a grammar error in "introduce the `merge` command"'s commit message. > > > > - fixed a couple of resource leaks in

Re: [PATCH v4 00/12] rebase -i: offer to recreate merge commits

On Fri, Feb 23, 2018 at 4:35 AM, Johannes Schindelin wrote: > Changes since v3: > > - fixed a grammar error in "introduce the `merge` command"'s commit message. > > - fixed a couple of resource leaks in safe_append() and do_reset(), pointed > out by Eric Sunshine. >

[PATCH v4 00/12] rebase -i: offer to recreate merge commits

Once upon a time, I dreamt of an interactive rebase that would not flatten branch structure, but instead recreate the commit topology faithfully. My original attempt was --preserve-merges, but that design was so limited that I did not even enable it in interactive mode. Subsequently, it *was*