threads / discuss / 19332

rebase edit handling

Subject: rebase edit handling

## tl;dr

4 messages between May 13, 2009 and May 13, 2009.

replies: 3people: 2as markdown or json

Nguyen Thai Ngoc Duy· May 13, 2009, 06:51 UTC · lore
Hi,

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.

-- 
Duy
Anders Melchiorsen· May 13, 2009, 08:18 UTC · re: Nguyen Thai Ngoc Duy · lore

Re: rebase edit handling

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

Show 5 quoted lines
> 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.
Nguyen Thai Ngoc Duy· May 13, 2009, 09:52 UTC · re: Anders Melchiorsen · lore

Re: rebase edit handling

On Wed, May 13, 2009 at 6:18 PM, Anders Melchiorsen <mail@cup.kalibalik.dk> wrote:

Show 13 quoted lines
> 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?

Hmm.. I was confused even when writing mail :P No not squash, actually conflicts.

Show 6 quoted lines
> 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.
Yes, looks interesting.
-- 
Duy

← back to recent threads