From: Johannes Sixt <j.sixt@viscovery.net>
Date: Mon, 19 Jan 2009 08:41:27 GMT
Subject: Re: parent-filter loses my merged branch -- what am I doing wrong?
Message-ID: <49743CB7.4030300@viscovery.net>
In-Reply-To: <7578B9A6-BF81-4096-B0FD-F433AD62A41E@develooper.com>

Ask Bjørn Hansen schrieb:
> On Sam Villain's recommendation I'm spending a bit of time cleaning up
> the branches and merges with git filter-branch, but I don't think I'm
> quite understanding how it's supposed to work.

Don't use --parent-filter for this; use grafts. You can see the history in
gitk right away. Later run filter-branch without a filter (except perhaps
the tag-name-filter).

-- Hannes