Re: [PATCH v3 0/1] Teach the builtin rebase about the builtin interactive rebase

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Oct 12, 2018, 07:59 UTC
Message-ID: <nycvar.QRO.7.76.6.1810120957480.45@tvgsbejvaqbjf.bet>
In-Reply-To: <xmqqy3bavdmk.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Sun, 7 Oct 2018, Junio C Hamano wrote:

Show 14 quoted lines

> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
> 
> > Note: while this patch targets pk/rebase-in-c-6-final, it will not work
> > correctly without ag/rebase-i-in-c. So my suggestion is to rewrite the 
> > pk/rebas-in-c-6-final branch by first merging ag/rebase-i-in-c, then
> > applying this here patch, and only then cherry-pick "rebase: default to
> > using the builtin rebase".
> 
> Is this a stale comment in the context of v3, where we pretty much
> know how the resulting topic should intertwine with other topics?  I
> am trying to see if I have do to anything differently this time, or
> just replacing the single commit while keeping the structure around
> that commit the same is fine.

Just replacing the single commit. For technical reasons, I still have to target pk/rebase-in-c-6-final in my branch.

> Also, I see there is a new iteration v8 of ag/rebase-i-in-c on the
> list, sent on Sep 27th (you were CC'ed but I suspect it was before
> you came back).  Are you happy with that update?

To be quite honest, I did not yet have time to look over it, but I verified that it has my suggested fix for the -S option.

Ciao, Dscho