On Wed, Aug 03, 2016 at 10:29:21PM +0200, Ludovic Courtès wrote: > In fact, commit 455859a50f88f625d13fc2f304111f02369b366b, which is the > core-updates merge, is *not* a merge commit. Instead it seems to be a > squashed commit of all of core-updates. Consequently, part of the > history of the files touched by this merge is squashed into this single > pseudo-merge commit. :-/
Dang, that means we lost the commit history of core-updates. It won't be in the Git log. > This can be fixed locally with a graft to give the merge commit the two > parents it is supposed to have: > > git replace --graft 455859a50f88f625d13fc2f304111f02369b366b \ > 742effef5629667b274087adc70b06abab86b252 > a8cb87abe98d57fb763d5b14524dc32c96bd31b5 I tried this and Git said "fatal: could not parse a8cb87abe98d57fb763d5b14524dc32c96bd31b5" I don't have a Git object of that name in my repo.
