Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mar 12, 2018, 10:46 UTC
Message-ID: <nycvar.QRO.7.76.6.1803121142550.20700@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To: <b329bb98-f9d6-3d51-2513-465aad2fa37a@gmail.com>

Hi Buga,

I just have two thoughts to contribute as answer, so please excuse the heavily cut quoted text:

On Sun, 11 Mar 2018, Igor Djordjevic wrote:

> Sometimes one just needs to read the manual, and I don`t really think
> this is a ton complicated, but just something we didn`t really have
> before (real merge rebasing), so it requires a moment to grasp the
> concept.

If that were the case, we would not keep getting bug reports about --preserve-merges failing to reorder patches.

> Saying in favor of `--rebase-merges`, you mean as a separate option,
> alongside `--recreate-merges` (once that series lands)?

No. I am against yet another option. The only reason I pollute the option name space further with --recreate-merges is that it would be confusing to users if the new mode was called --preserve-merges=v2 (but work *totally differently*).

Ciao, Dscho