git undo

Add this to your ~/.gitconfig

[alias]
    undo = reset --soft HEAD@{1}

Now if you do something stupid (like an amend that should not exist) just run : git undo.