The right undo depends on one question: where is the mistake right now? In your folder, in the staging area, in a local commit, or already pushed?