On Mon, Nov 26, 2012 at 3:19 PM, Matthieu Moy <matthieu....@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). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
