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
Johannes Sixt <j.sixt@viscovery.net>
Date
Jan 19, 2009, 08:41 UTC
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
Previous: Ask Bjørn HansenNext: Ask Bjørn Hansen
Message 2 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.