Re: [PATCH] rebase: learn --discard subcommand

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: May 30, 2011, 08:44 UTC
Message-ID: <4DE358D5.9010900@alum.mit.edu>
In-Reply-To: <20110530051434.GA3723@Imperial-SD-Longsword>

On 05/30/2011 07:14 AM, Tim Mazid wrote:

Show 17 quoted lines

> On Mon, May 30, 2011 at 06:46:48AM +0200, Michael Haggerty wrote:
>> On 05/29/2011 01:08 AM, Jonathan Nieder wrote:
>>> Agh, "git rebase --abort --keep-head" feels a little too long to be
>>> memorable.  Still, hope that helps.
>>
>> It seems like the distinction is analogous to "git reset --soft", so maybe
>>
>>     git rebase --abort --soft
> 
> Well, the only problem with that is the "--soft" option refers to the
> "reset" command given to git, whereas in your proposed syntax, the
> "--soft" option refers to the _other_ option, "--abort".
> 
> This may seem a little nit-picky, but such a difference could lead to
> confusion.  Perhaps "--soft-abort" or "--soft-abort" would be better?  A
> single option to the "git rebase" command rather than a "sub-option"
> given to another option.

To be even more nit-picky :-), --abort (and --continue) are really subcommands of rebase. The fact that they are implemented as options is the original source of the inconsistency. Of course this cannot be changed because "git rebase abort" already has a different meaning.

Michael

-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/