Re: [RFC PATCH] Make the rebase edit mode really end up in an edit state

[Johan Herland <johan@herland.net>]

On Thursday 15 January 2009, Sverre Rabbelier wrote:
> On Thu, Jan 15, 2009 at 11:01, Johan Herland wrote:
> > "modify" does the "git reset --soft HEAD^" (Anders' suggestion)
> > "amend" requires a "git commit --amend" (current behaviour)
>
> Why have amend do the same as edit?

The names I chose are somewhat arbitrary, since we obviously have to 
keep on bikeshedding until we have something everybody can agree to.

However, my rationale was that IMO the word "edit" more closely matches 
Anders' suggestion, and is therefore somewhat misleading as a 
description of the current behaviour. But we obviously cannot change 
the meaning of "edit" without upsetting current users. Therefore, 
introduce "amend" to more accurately describe the current behaviour. As 
for "modify", it was simply the best synonym for "edit" I could find.


...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net