From: Junio C Hamano Date: Tue, 22 Jul 2008 23:55:20 GMT Subject: Re: [PATCH] rebase -i: only automatically amend commit if HEAD did not change Message-ID: <7viquxjwyf.fsf@gitster.siamese.dyndns.org> In-Reply-To: <32541b130807221522r2a43c49cl6400f00dbe7451a0@mail.gmail.com> "Avery Pennarun" writes: > On 7/22/08, Johannes Schindelin wrote: >> If the user called "rebase -i", marked a commit as "edit", "rebase >> --continue" would automatically amend the commit when there were >> staged changes. >> >> However, this is actively wrong when the current commit is not the >> one marked with "edit". So guard against this. > > This patch is perhaps a symptom of something I've been meaning to ask > about for a while. > > 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?