Re: [PATCH v6 00/15] rebase -i: offer to recreate commit topology

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Apr 10, 2018, 22:11 UTC
Message-ID: <nycvar.QRO.7.76.6.1804110009080.56@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <87tvsj6rn2.fsf@javad.com>

Hi Sergey,

On Tue, 10 Apr 2018, Sergey Organov wrote:

Show 14 quoted lines

> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
> 
> > Once upon a time, I dreamt of an interactive rebase that would not
> > flatten branch structure, but instead recreate the commit topology
> > faithfully.
> 
> [...]
> 
> > Think of --rebase-merges as "--preserve-merges done right".
> 
> Both option names seem to miss the primary point of the mode of
> operation that you've formulated in the first sentence. I suggest to
> rather call the new option in accordance to your description, say,
> --no-flatten, --keep-topology, or --preserve-shape.

A very quick A/B test shows that neither --no-flatten nor --keep-topology and certainly not --preserve-shape conveys to Git users what those options are supposed to do.

But --rebase-merges did convey the purpose of my patch series. So there.

Ciao, Johannes