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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html