From: Anders Melchiorsen <mail@cup.kalibalik.dk>
Date: Wed, 13 May 2009 08:18:27 GMT
Subject: Re: rebase edit handling
Message-ID: <589ffd8942fd21b6f727163f78592381@mail.hotelhot.dk>
In-Reply-To: <fcaeb9bf0905122351y3a1235e8s5cc9b83c225ca9c6@mail.gmail.com>

On Wed, 13 May 2009 16:51:33 +1000, Nguyen Thai Ngoc Duy
<pclouds@gmail.com>
wrote:

> Could we unit the way to squash/edit commits in rebase? If I squash a
> commit it, I need to to update the index and continue rebase. If I
> edit a commit, I need to amend that commit. The problem is when I have
> a few edits/squashes in the same rebase, I easily get confused and do
> "commit --amend" on squash too.

A squash does not leave you at the prompt, unless you abort the editor
with the concatenated commit messages. So where does your confusion
come from?

Anyway, here is a (fruitless) thread on the confusing UI of interactive
rebase:

  http://thread.gmane.org/gmane.comp.version-control.git/105738

Maybe it answers your question in some way.


Anders.