From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 29 Sep 2007 02:12:51 GMT
Subject: Re: [PATCH] rebase -i: support single-letter abbreviations for the actions
Message-ID: <7vfy0ymd7g.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <Pine.LNX.4.64.0709290231300.28395@racer.site>

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

> When you do many rebases, you can get annoyed by having to type out
> the actions "edit" or "squash" in total.
>
> This commit helps that, by allowing you to enter "e" instead of "edit",
> or "s" instead of "squash", and it also plays nice with "merge" or "amend"
> as synonyms to "squash".

I am not sure if we want to taint the words merge and amend like
this.  I was hoping someday you would allow people to reorder
something like this...

          e
           \     
 ---a---b---c---d

into something like this:

      e
       \     
 ---b'--c'--a'+d'

The insn sequence you prepare for the user to edit would be:

	pick	a	
	pick	b
	merge   c
        pick    d

and then the user would rewrite that to:

	pick	b
        merge   c
        pick    a
        squash  d

I do not think making 'amend' a synonym to 'squash' is correct
either; isn't it closer to 'edit'?

I however do agree that giving short-hand would be a good idea.