From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 28 Nov 2008 21:34:54 GMT
Subject: Re: Removing part of the history
Message-ID: <20081128213454.GE19355@genesis.frugalware.org>
In-Reply-To: <49306150.6010701@datacom.ind.br>

On Fri, Nov 28, 2008 at 07:23:28PM -0200, Samuel Lucas Vaz de Mello <samuellucas@datacom.ind.br> wrote:
> There is any way to get rid of the (broken) cvs-old tree?
> 
> I've tried to rebase, but the commits from A' and A are different, it
> tries to reapply all history in CVS.

Have you tried git rebase --onto?

> I've tried to checkout a point before our changes start (B') and then,
> using a script, cherry-pick all commits up to HEAD that are not in
> cvs-old branch. This approach didn't handled well merges between our
> branches (K-L-M and X-Y).

git rebase --preserve-merges is probably what you are searching for.