From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 18 Jun 2009 08:06:07 GMT
Subject: Re: [PATCH] Re: rebase -i: auto-squash commits
Message-ID: <alpine.DEB.1.00.0906181003300.4848@intel-tinevez-2-302>
In-Reply-To: <7v8wjq2kqc.fsf@alter.siamese.dyndns.org>

Hi,

On Wed, 17 Jun 2009, Junio C Hamano wrote:

> Now, I initially had the same reaction as Dscho.  What happens if I 
> really want to write a commit message that begins with "squash to "?
> 
> But after thinking about it a bit more, I do not think it is as bad as 
> it sounds anymore.
> 
> The commit not only must begin with "squash to " but also there has to 
> be a matching commit whose message begins with the remainder of the 
> title of the "squash to" commit _in the range you are rebasing 
> INTERACTIVELY_.
> 
> In addition, the resulting rebase insn is presented in the editor, and 
> in a rare case where you do have such a commit, you can rearrange it 
> back.

Well, that really sounds pretty awkward to me.  I regularly call such 
commits "amend".  If there is a risk I confuse myself as to which commit 
needs to be amended, I use "amend.<short-hint>".

I'd really rather stay with "fixup".  And as I use single-letter commands 
quite often, I'd also rather stay away from that magic "!".  And by 
"magic" I really mean that: people will not find that magic intuitive at 
all.

My vote is for "fixup".

Ciao,
Dscho