Re: [PATCH] Re: rebase -i: auto-squash commits

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Jun 18, 2009, 08:44 UTC
Message-ID: <alpine.DEB.1.00.0906181042270.4848@intel-tinevez-2-302>
In-Reply-To: <vpqbpomey8c.fsf@bauges.imag.fr>

Hi,

On Thu, 18 Jun 2009, Matthieu Moy wrote:

Show 6 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> > I'd really rather stay with "fixup".
> 
> I like fixup. I'd say "fixup: <message>" so that the thing actually
> looks like a program directive rather than natural language.

Umm...  The thing would be used like this:

original edit list:

	pick b1ab1ab First commit
	pick deafbee Second commit
	pick 0123456 This is a fixup for the first commit

edited edit list:

	pick b1ab1ab First commit
	fixup 0123456 This is a fixup for the first commit
	pick deafbee Second commit

It would squash the first two commits, forget about the second commit message and continue with the last commit. No user interaction unless there are merge conflicts.

Ciao, Dscho