Re: BUG: "cherry-pick A..B || git reset --hard OTHER"

From: Stephan Beyer <s-beyer@gmx.net>
Date: Dec 7, 2016, 20:35 UTC
Message-ID: <8d32c645-e850-5e7c-b01c-6e4d81e2d672@gmx.net>
In-Reply-To: <xmqq8trry08k.fsf@gitster.mtv.corp.google.com>

Hi,

On 12/07/2016 09:04 PM, Junio C Hamano wrote:

Show 7 quoted lines

> Stephan Beyer <s-beyer@gmx.net> writes:
> 
>> [1] By the way: git cherry-pick --quit, git rebase --forget ...
>> different wording for the same thing makes things unintuitive.
> 
> It is not too late to STOP "--forget" from getting added to "rebase"
> and give it a better name.

Oh. ;) I am not sure. I personally think that --forget is a better name than --quit because when I hear --quit I tend to look into the manual page first to check if there are weird side effects (and then the manual page says that it "forgets" ;D). So I'd rather favor adding --forget to cherry-pick/revert instead... or this:

> Having said that, I have a feeling that these options do not have to
> exist; isn't their presence just a symptom that the "--abort" for
> the command misbehaves?  Isn't the reason why there is no need for
> "am --quit" because its "--abort" behaves more sensibly?

You're probably right. I have no other use-case in mind than "oh I forgot that I was rebasing... now just abort that and don't bother me further (i.e. please don't bring me back)"

~Stephan