From: Johannes Sixt <j.sixt@viscovery.net>
Date: Tue, 03 Mar 2009 07:32:39 GMT
Subject: Re: proper way to merge?
Message-ID: <49ACDD17.2060601@viscovery.net>
In-Reply-To: <450196A1AAAE4B42A00A8B27A59278E709F07452@EXCHANGE.trad.tradestation.com>

John Dlugosz schrieb:
> I did not find 'grafts' in the documentation,
> but I looked for it now that I know about it.  So you can add another
> parent to the graph just by adding a line to that file.  BTW,
> filter-branch isn't available on msysgit.

Huh? filter-branch *is* in msysgit. Why do you think it is not?

>  But leaving it in that grafts
> file should be OK -- is that pushed/pulled with everything else?

No.

You really want to use filter-branch if the new parent is to be permanent.

-- Hannes