From: Avery Pennarun <apenwarr@gmail.com>
Date: Wed, 23 Jul 2008 15:55:41 GMT
Subject: Re: [PATCH] rebase -i: only automatically amend commit if HEAD did not change
Message-ID: <32541b130807230855y19bbedfah38dce9391ff4f481@mail.gmail.com>
In-Reply-To: <7viquxjwyf.fsf@gitster.siamese.dyndns.org>

On 7/22/08, Junio C Hamano <gitster@pobox.com> wrote:
> "Avery Pennarun" <apenwarr@gmail.com> writes:
>  > Why doesn't "edit" just stage the commit and not auto-commit it at
>  > all?  That way an amend would *never* be necessary, and rebase
>  > --continue would always do a commit -a (if there was anything left to
>  > commit).  The special case fixed by this patch would thus not be
>  > needed.
>
> That would actually be in-line with the way how "rebase --skip" does the
>  resetting without asking the user to do so, wouldn't it?

I'm not sure exactly what you mean, but I think with my proposed
change, "rebase --skip" would do "git reset --hard HEAD" while "rebase
--continue" would do "git commit -a", so it would be nice and
symmetrical, where currently it isn't exactly.

Have fun,

Avery