git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: parent-filter loses my merged branch -- what am I doing wrong?

From
Ask Bjørn Hansen <ask@develooper.com>
Date
Jan 20, 2009, 20:05 UTC
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:
Show 11 quoted lines
> 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/
Previous: Johannes Sixt
Message 3 of 3 in “parent-filter loses my merged branch -- what am I doing wrong?”
  1. Ask Bjørn HansenJan 19, 2009
  2. Johannes SixtJan 19, 2009
  3. Ask Bjørn HansenJan 20, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.