From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 02 Aug 2017 21:57:17 GMT
Subject: Re: [PATCH 6/6] cherry-pick/revert: reject --rerere-autoupdate when continuing
Message-ID: <xmqqpocdr5tu.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170802104420.12809-7-phillip.wood@talktalk.net>

Phillip Wood <phillip.wood@talktalk.net> writes:

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> cherry-pick and revert should not accept --[no-]rerere-autoupdate once
> they have started.

Hmph, why shouldn't they?  In other words, shouldn't the usual "try
to carry forward from the original invocation (saved in the state
file), but allow overriding from the command line" rule apply?

I took a brief look at earlier steps and I thought 1-4/6 were all
good.  I am not sure (yet) about these last two patches.

Thanks for working on this topic.