Undo the last commit

Keep the changes in the working tree:

git reset --soft HEAD~1

Throw them away as well:

git reset --hard HEAD~1