From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 19 Dec 2016 18:58:31 GMT
Subject: Re: [PATCH v2 24/34] sequencer (rebase -i): respect strategy/strategy_opts settings
Message-ID: <xmqqzijroieg.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <a21233f368f066408051e6bdc9a2b6ec513e9e11.1481642927.git.johannes.schindelin@gmx.de>

Johannes Schindelin <johannes.schindelin@gmx.de> writes:

> The sequencer already has an idea about using different merge
> strategies. We just piggy-back on top of that, using rebase -i's
> own settings, when running the sequencer in interactive rebase mode.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  sequencer.c | 26 +++++++++++++++++++++++++-
>  1 file changed, 25 insertions(+), 1 deletion(-)

A handful of steps before and including this one look quite faithful
port to C from the scripted one.  

Looking good.