From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Mon, 26 Nov 2012 14:19:33 GMT
Subject: Re: commit gone after merge - how to debug?
Message-ID: <vpqboekqwei.fsf@grenoble-inp.fr>
In-Reply-To: <CAO1Khk9Y_SC8q4iHnv848Z+dXMaeUOWxzW76yPSj_as317_u5g@mail.gmail.com>

Igor Lautar <igor.lautar@gmail.com> writes:

> git annotate <file> <merge commit>^2
>  - shows line as being modified by a commit done after file was added
> - ie., state I would expect after a merge

What about "git annotate <file> <merge-commit>^1"?

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

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/