From: Igor Lautar <igor.lautar@gmail.com>
Date: Mon, 26 Nov 2012 14:23:56 GMT
Subject: Re: commit gone after merge - how to debug?
Message-ID: <CAO1Khk_Czr9=1pECpFAkqfGaYz7qPSE1jvEtQ3u2HOASq+yMwQ@mail.gmail.com>
In-Reply-To: <vpqboekqwei.fsf@grenoble-inp.fr>

On Mon, Nov 26, 2012 at 3:19 PM, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> What about "git annotate <file> <merge-commit>^1"?

No change, line version goes back to when file was added.

> Was the merge completely automatic, or were there any conflict?

No conflicts at all. In fact, that particular file was not touched by
one side of merge, only by another. It seems like git ignored the
change, but still recorded history (shown only with --full-history).