From: Ask Bjørn Hansen <ask@develooper.com>
Date: Tue, 20 Jan 2009 20:05:30 GMT
Subject: Re: parent-filter loses my merged branch -- what am I doing wrong?
Message-ID: <EA6D5B1E-DA22-4E57-86B6-A192090FCE53@develooper.com>
In-Reply-To: <49743CB7.4030300@viscovery.net>


On Jan 19, 2009, at 0:41, Johannes Sixt wrote:

> 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).

Aha - excellent.  I didn't understand clearly from the documentation  
that they'd be "written in stone" by filter-branch.  Building the  
grafts with .git/info/grafts was much much easier.


   - ask

-- 
http://develooper.com/ - http://askask.com/