From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 25 Sep 2007 14:49:24 GMT
Subject: Re: Q: howto rebase
Message-ID: <Pine.LNX.4.64.0709251548390.28395@racer.site>
In-Reply-To: <BAY105-F33DC84FACB8B66BFEB9EC8FFB70@phx.gbl>

Hi,

On Tue, 25 Sep 2007, lode leroy wrote:

> I'm trying to understand how rebase works, but I need some help to get it.
> Suppose I do the following workflow... (see below)
> 
> In "version B" I introduce the "fix c", but in "version D" I realize it
> should have
> been in some other place. (commit D moves the fix to its proper place).
> A-B-C-D-E
> 
> Now I want to 'rewrite history'.
> I would like to move commit D after B
> A-B-D'-C'-E
> 
> and then fold the commits B and D' into a single commit.
> A-B'-C'-E
> 
> I somehow managed to get this done using "rebase -i"
> by exchanging the 2 appropriate lines, and then deleting the second one,
> but I'd like to understand how to do this from the command line...

Almost.  Your "fold" is called "squash".  So instead of deleting the 
second one, you probably wanted to squash it.

Hth,
Dscho