This assumes you have no changes loose in your working copy.
At any point you can run gitk to view the commit history. I use gitk all the time, to view and search through the commit history, find the SHA1 hash of a particular commit, and check the commit graph.
First, make sure master is up to date (it most likely already is, but no harm in checking)
git checkout master git fetch upstream