Use git reflog to see what your HEAD pointed to before you screwed it up.
You should see something like:
48ab8d HEAD@{0}: pull: Fast-forward
a34bda HEAD@{5}: commit: my last commit message
Now, point your master branch back at the commit before the bad pull:
git reset --hard a34bda
Done. Like it never happened.