Re: More help needed on merging unrelated repos

From: Karl Hasselström <kha@treskal.com>
Date: Nov 6, 2008, 08:37 UTC
Message-ID: <20081106083751.GA10359@diana.vm.bytemark.co.uk>
In-Reply-To: <46d6db660811041430l74d9a100kc15ac46dea8ff63f@mail.gmail.com>

On 2008-11-04 23:30:56 +0100, Christian MICHON wrote:

> note the merge can work, but it's still done in 2 steps. :(
> thanks for suggesting this.

If it had worked, you'd have gotten just one merge commit. What you want to do is entirely possible, but it seems the high-level commands were not designed with your use-case in mind.

Another thing you could try is to merge the two branches separately, getting a history like this:

  p1----\
         \
  p2---A--B
      /
  p3--

And then use grafts to convince git that B has parents p1, p2, and p3 (instead of its actual parents p1 and A). (Grep for "graft" in the Documentation directory.)

And then use git-filter-branch to rewrite history so that the grafted history becomes the real history.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle