I am using this workflow:

<http://reinh.com/blog/2009/03/02/a-git-workflow-for-agile-teams.html>

where he mentions: "First, and while in your master branch (git checkout master), pull in the most recent changes: 
git pull origin master
This should never create a merge commit because we are never working directly in master."

Whoops, I just did. I accidentally committed a few changes to a couple of files to my master (vs my topic branch). I then realized my mistake - deleted my topic branch. Now I want to get rid of my committed changes (to the master), what is the right thing to do? I have not rebased yet or pushed my changes to repo, so it is all local.

In essence, I want to pull down the latest version of the master code and just disregard everything I have done to my local master (which is really one commit).