Re: [PATCH] Fix rebase -p --onto

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Jul 17, 2009, 08:47 UTC
Message-ID: <4A603AA4.7020800@viscovery.net>
In-Reply-To: <4A6038E8.1090402@viscovery.net>

Johannes Sixt schrieb:

Show 20 quoted lines

> I have used rebase -i -p in the past to rewrite history that involves
> merges of topic branches like this:
> 
>   ---------Y--M--M--F     <-- master
>              /  /
>   ----a--a--a  /
>               /
>   --b--b--b--b
> 
> where F is a fixup that I want to insert between Y and M, and I thought
> rebase -i -p was intended for this use-case.
> 
> With this in mind, I do not see why should we distinguish the cases. I
> would even go so far to say that this is OK:
> 
>   X---a---o---o---M            X---a
>        \         /    ===>          \
>         x---x---x                    x---x---x
>                                               \
>   Y                            Y---a'--o'--o'--M'

because it is a user error: wrong tool for the task. The right tool would perhaps be git-sequencer.

-- Hannes (I hit the send button too early by accident, sorry for the excessive quoting in the previous mail.)