Undo Commits

Commited but not pushed to the remote?

git reset --soft HEAD^

Commit pushed to the remote?

git reset HEAD^ --hard
$ git push origin -f