From: Jed Brown <jed@59a2.org>
Date: Wed, 27 Mar 2013 19:16:24 GMT
Subject: Re: Segfault with merge-tree on multiple Git versions
Message-ID: <87zjxo3b7b.fsf@59A2.org>
In-Reply-To: <51533E8D.5050206@atechmedia.com>

Charlie Smurthwaite <charlie@atechmedia.com> writes:

> Yes, I would need to be able to do this on a bare repo for my use case. 

And if it's on the server, you don't want this to be observable, so
you don't want HEAD to move around. I don't know a better way than:

  $ git clone --shared -b upstream-branch bare-repo.git /tmp/merge-repo
  $ cd /tmp/merge-repo
  $ git pull URL incoming-branch

Cloning with --shared just writes a path into .git/objects/info/alternatives
and it doesn't need to be on the same file system (unlike --local).

Since 'git merge-tree' just works with trees, it has less information
than 'git merge'.