Igor Lautar <igor.lautar@xxxxxxxxx> 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/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html