You cannot see the history of fixing your personal branch, since it is not part of its merger.
Update: This is actually not quite the way I just saw in a small test. Could you tell us more about how exactly he combined his changes into your branch without showing his own commits from his branch?
Sorry for the confusion.
From the original answer: You can use git logwith --mergesand parameters --author=<pattern>to filter out all the merges performed by this particular author. Then you can happily uncover those commits. That way, you could at least find all the changes that he made with his mergers in one place.
source
share