From: Thomas Rast <trast@student.ethz.ch>
Date: Fri, 11 Dec 2009 12:51:37 GMT
Subject: Re: How to selectively recreate merge state?
Message-ID: <200912111351.38695.trast@student.ethz.ch>
In-Reply-To: <20091211110944.GB19232@atjola.homenet>

Björn Steinbrink wrote:
> On 2009.12.11 11:44:25 +0100, Michael J Gruber wrote:
> > Jakub Narebski venit, vidit, dixit 11.12.2009 02:33:
> > >  $ echo -e "100644 257cc5642cb1a054f08cc83f2d943e56fd3ebe99 1\tfoo" | 
> > >    git update-index --index-info
> > 
> > Yeah, if we knew that sha1...
> 
> Hm, isn't that "$(git merge-base HEAD MERGE_HEAD):foo"?

Not if the merge-base isn't unique and you're using the recursive
strategy, IIUC.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch