git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: "Ask Bjørn Hansen" <ask@develooper.com>
Cc: git@vger.kernel.org
Subject: Re: parent-filter loses my merged branch -- what am I doing wrong?
Date: Mon, 19 Jan 2009 09:41:27 +0100	[thread overview]
Message-ID: <49743CB7.4030300@viscovery.net> (raw)
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

  reply	other threads:[~2009-01-19  8:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-19  3:45 parent-filter loses my merged branch -- what am I doing wrong? Ask Bjørn Hansen
2009-01-19  8:41 ` Johannes Sixt [this message]
2009-01-20 20:05   ` Ask Bjørn Hansen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49743CB7.4030300@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=ask@develooper.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).