2 messages, 2 authors, 2016-06-15 · open the first message on its own page
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:55:25
Igor Lautar [off-list ref] 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/
From: Igor Lautar <hidden>
Date: 2016-06-15 22:55:25
On Mon, Nov 26, 2012 at 3:19 PM, Matthieu Moy [off-list ref] 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).