Undo Last Commit

Sometimes we mess up the last commit badly and a simple revert isn’t enough. We want to wipe it off the face of the earth (locally and remotely) as if it never happened.

1. Fix message or forgotten file (Quick Option)

If you just made a typo in the message or forgot to add a file, you don’t need to reset. Add the changes and “amend” the commit. This replaces the last commit with a new one fixing the mistake.

git add .
git commit --amend

git add .
git commit --amend

When you run this, your default text editor (Vim, Nano, VS Code…) will open with the previous commit message.

1. Edit the message if you like.
2. Save and close the file (in Vim: :wq).
3. Git will detect you are done and create the new commit replacing the old one.

2. Go back without losing work (Local)

We use reset --soft to undo the commit but keep your changes staged. This way you can fix what was wrong, add what was missing, and commit again.

git reset --soft HEAD~1

git reset --soft HEAD~1

3. Overwrite history (Remote)

Now your local repo is “in the past” but GitHub is still “in the future”. If you try a normal push, git will reject you. You need to force write so the remote accepts your old version as the “absolute truth”.

git push origin +main

git push origin +main

Note: The + symbol before the branch name (+main) is shorthand syntax for --force. It does the same thing but makes you feel more like a hacker.

Dangerous Alternative: Hard Reset (The Nuclear Option)

If git reset --soft is like backspacing, git reset --hard is like burning the paper and starting fresh. It’s the nuclear option for when you don’t want to recover anything from your last commit.

1. Erase all traces (Local)

This moves the pointer back and syncs your working directory to that old state.

git reset --hard HEAD~1

git reset --hard HEAD~1

2. Force history (Remote)

Just like with soft reset, the remote will reject this because you rewrote the past.

git push origin +main

git push origin +main