What is the difference between restore and checkout -- file?

restore does exactly the same thing but more clearly. It's the modern command recommended since Git 2.23. checkout -- file still works but is confusing because checkout is also used for branch switching.

How do I unstage a file without losing the changes?

Use git restore --staged file. The changes remain in the working directory, they are just removed from the staging area. It's the equivalent of git reset HEAD file.

Can I recover a file after a restore?

If the changes were not committed or stashed, they are permanently lost. restore overwrites the file contents. Always check with git diff before restoring.

How do I restore a file from another branch?

Use git restore --source branch -- file. For example, git restore --source main -- config.js to get the version of config.js from the main branch.

Can I restore a deleted file?

Yes! If the file was in the last commit, git restore file will recreate it. If you want to recover it from an older commit, use --source with the commit hash.

Git restore: restore files easily

git restore is the modern command to undo changes, unstage files or restore from a commit. Clear, simple and unambiguous.

Practice git restore Git Glossary

gitquest — enquête

Modern

What is git restore?

git restore manipulates files in the working directory and staging area. It's the modern command that replaces git checkout -- file and git reset HEAD file.

Two main modes: without a flag, it restores the working directory. With --staged, it unstages files.

Git restore syntax

git restore file

Undo changes to the file

git restore --staged file

Remove the file from staging

git restore --source HEAD~1 file

Restore from a specific commit

Git restore in practice

Undo changes or unstage files.

Restore files

gitquest — restore

# Undo changes to a file (revert to last commit)

$git restore index.html

index.html restored

# Undo changes to all files

$git restore .

All files restored

# Restore a file from a specific commit

$git restore --source a1b2c3d index.html

index.html restored from a1b2c3d

Unstage files

gitquest — restore --staged

# Remove a file from staging (unstage)

$git add index.html style.css

$git restore --staged index.html

index.html removed from staging

# Remove all files from staging

$git restore --staged .

All files removed from staging

# The changes are still there, just not staged

Essential restore commands

git restore file

Undo unstaged changes

git restore --staged file

Remove from staging (unstage)

git restore .

Restore all modified files

git restore --source HEAD~2 .

Restore from 2 commits ago

git restore --staged --worktree f

Unstage and restore at once

git restore --source main f

Restore from another branch

Common mistakes with git restore

Restoring without checking the diff

restore overwrites your changes without confirmation. Use git diff file before to check what you will lose.

Confusing restore and restore --staged

Without a flag, restore overwrites changes. With --staged, it just removes from staging (changes remain). This is a crucial difference.

Thinking restore is reversible

Uncommitted changes overwritten by restore are permanently lost. There is no Ctrl+Z for uncommitted changes.

Part of the Undo Changes in Git guide

Related commands

git add

Add files to staging

git switch

Switch branches

git stash

Save changes temporarily

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

Questions about git restore

Master file restoration with GitQuest

Learn to manipulate your files and staging area with confidence.

Start the investigations