[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ‘core-updates’ merge is a squashed commit
From: |
Leo Famulari |
Subject: |
Re: ‘core-updates’ merge is a squashed commit |
Date: |
Wed, 3 Aug 2016 17:10:32 -0400 |
User-agent: |
Mutt/1.6.0 (2016-04-01) |
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.
- Re: core-updates merged!, (continued)
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Ludovic Courtès, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Ludovic Courtès, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Ludovic Courtès, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- Re: core-updates merged!, Andreas Enge, 2016/08/03
- Re: core-updates merged!, Leo Famulari, 2016/08/03
- ‘core-updates’ merge is a squashed commit, Ludovic Courtès, 2016/08/03
- Re: ‘core-updates’ merge is a squashed commit,
Leo Famulari <=
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mark H Weaver, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Ludovic Courtès, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Andreas Enge, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Mathieu Lirzin, 2016/08/04
- Re: ‘core-updates’ merge is a squashed commit, Leo Famulari, 2016/08/04