What is the difference between git reset and git revert?

git reset removes the commit from the history (it "rewinds" HEAD). git revert creates a new commit that undoes the changes of a previous commit, without touching the history. Revert is safer for shared branches because it doesn't rewrite history.

How do I undo the last commit without losing my changes?

Use git reset --soft HEAD~1. This undoes the commit but keeps all your changes in the staging area. You can then modify your files and create a new commit.

How do I undo a commit that was already pushed?

Use git revert to create a reverse commit, then push the result. Never use git reset on a commit that was already pushed, as it would rewrite shared history and cause problems for the team.

How do I recover a commit deleted by mistake?

Use git reflog to find the hash of the deleted commit. It will appear in the list of HEAD movements. Then type git cherry-pick to recover it or git reset --hard to go back to that state.

What is the difference between --soft, --mixed and --hard?

--soft undoes the commit but keeps changes in staging. --mixed (default) undoes the commit and staging, but keeps changes in your files. --hard undoes everything: commit, staging and changes. Warning, --hard is irreversible (except via reflog).

Undo a Git commit: reset, revert and restore

Committed too quickly? Pushed a bug? Don't panic. Git offers several ways to undo. This page explains which one to use depending on your situation.

Practice undoing Git glossary

gitquest — enquête

Which command should you use?

Uncommitted changes

git restore

You modified files but haven't committed yet. You want to go back to the previous version.

git restore <file>

Local commit (not pushed)

git reset

You committed but haven't pushed yet. You want to undo the commit (with or without the changes).

git reset --soft HEAD~1

Already pushed commit

git revert

The commit is already shared. You want to undo it cleanly without rewriting history.

git revert <hash>

The 3 methods in action

Each method illustrated with a concrete example in the terminal.

git reset --soft

gitquest — reset

# Undo the last commit while keeping changes

$git log --oneline -3

a1b2c3d (HEAD -> main) Commit too quickly

f4e5d6c Add config file

b7c8d9e Initial commit

$git reset --soft HEAD~1

HEAD is now at f4e5d6c

$git status

Changes to be committed: your files are in staging

git revert

gitquest — revert

# Undo a commit by creating a reverse commit (safe)

$git log --oneline -3

a1b2c3d (HEAD -> main) Add buggy function

f4e5d6c Add config file

$git revert a1b2c3d

[main c3d4e5f] Revert "Add buggy function"

The commit is undone without modifying the history!

git restore

gitquest — restore

# Undo uncommitted changes

$git status

Unstaged changes:

modified: index.html

$git restore index.html

The file is back to its last committed version

# Unstage a file (without losing changes)

$git restore --staged style.css

The file is unstaged but changes are preserved

Comparison: reset vs revert vs restore

Criteria	git reset	git revert	git restore
Acts on	Commits	Commits	Files
Rewrites history	Yes	No	No
Safe for shared branch	No	Yes	Yes
Keeps changes	Depends on mode (--soft/--hard)	Creates a new commit	Discards changes
Use case	Local commit to fix	Pushed commit to undo	Modified file to restore

A

GitQuest is created by Anaïs (nouvelle fenêtre), web developer and head of education, specializing in tech training and digital accessibility.

Questions about undoing commits

Learn to undo without panicking

GitQuest trains you to master reset, revert and restore in realistic situations.

Start practicing now