Adding to Asclepius's answer here a way to view the commit history up to the common ancestor (including it).

I find this helpful to see what has been going on since the fork.

$ git checkout feature-branch
$ git log HEAD...$(git merge-base --fork-point master)~1