Re: [PATCH] git-rebase -i: have an option for amending the commit message only.

From: Stephan Beyer <s-beyer@gmx.net>
Date: Jun 11, 2008, 22:51 UTC
Message-ID: <20080611225107.GB7200@leksak.fem-net>
In-Reply-To: <20080611222744.GD16439@artemis.madism.org>

Hi,

I want to add a quick note as the one who is currently responsible for future git-sequencer ;-)

Show 6 quoted lines

> > > +		comment_for_reflog comment
> > > +
> > > +		mark_action_done
> > > +		pick_one $sha1 ||
> > > +			die_with_patch $sha1 "Could not apply $sha1... $rest"
> > > +		output git commit --no-verify --amend -e -C HEAD

I dislike that "comment" does a pick. Well, your version is consistent with the rest of rebase-i, but inconsistent to the more atomic and general approach of the git-sequencer thread.

You use
	comment deadf00
instead of
	pick deadf00
Would you mind if you had to use something like this:
	pick deadf00
	comment
to reedit the message of deadf00?

The difference for you as vim user is that you won't type "<Home> c w comment", but "o comment" :-) The outcome is that you can also use it for patches, not only for cherry-picks ;)

>   To be fair, if someone has a better name, I'm all for it.

What about "amend"? :) ...or "amend-message" or something like this.

> I quite care about the feature, edit needs me to run the --amend myself,
> whereas I often just want to fix a typo in a commit log.

I understand ;)

Well, I like to add it to the sequencer spec and to the prototype as soon as the name is clear ;-)

Regards,
  Stephan

-- 
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F