Re: Recovering from commit --amend in rebase --interactive

From: Jan Krüger <jk@jk.gs>
Date: Jun 1, 2010, 09:57 UTC
Message-ID: <20100601115755.04ff4a0d@jk.gs>
In-Reply-To: <alpine.DEB.2.00.1006011022030.2352@ds9.cixit.se>

Peter Krefting <peter@softwolves.pp.se> wrote:

> Last time this happened to me, I *did* notice my mistake as I entered
> the editor, since it came up with the previous commit's message.
> However, as the commit message file was in a good shape, I found no
> way to break out of the amend.

It might be easy to miss, but it's there, right in the editor:

# Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and *an empty message aborts the commit*. (Emphasis added)

In general, it might be helpful to warn very loudly upon doing a commit --amend after fixing conflicts, but an implementation would probably be ugly and for all I know, there might be people who frequently cause conflicts while amending; those guys would probably be quite annoyed at such a warning.

-Jan