Git Undoing Changes: Mastering git restore, git clean & Discarding Edits

Every developer makes mistakes—editing the wrong function, introducing unintended syntax errors, or staging files prematurely. Git provides powerful, surgical mechanisms to undo mistakes at every level of the three-tree lifecycle. In Git 2.23+, the dedicated git restore command makes this process clear and safe.

1. Discarding Unstaged Changes in the Working Directory

If you modified a file in your editor but haven't run git add yet, and you want to throw away all your edits and return the file to the exact state of the latest commit:

# Discard changes to a single file:
$ git restore src/app.js

# Discard changes to multiple specific files:
$ git restore styles.css index.html

# Discard all unstaged changes across your entire project:
$ git restore .

2. Unstaging Files from the Staging Area (git restore --staged)

If you ran git add on a file by mistake, but you still want to keep your edits in your working directory, simply unstage the file:

# Unstage a single file (moves it from Index back to Working Directory):
$ git restore --staged package.json

# Unstage all staged files:
$ git restore --staged .

After running this, package.json remains modified on your disk, but it is no longer marked for the next commit snapshot.

3. Removing Untracked Files with git clean

git restore only operates on files that Git already tracks. If you created 10 new experimental files, generated log files, or downloaded build artifacts that are untracked, use git clean to purge them:

# Step 1: ALWAYS run a dry run first to see what WILL be deleted:
$ git clean -dn
Would remove test_draft.js
Would remove temp_output.json

# Step 2: Delete untracked files permanently:
$ git clean -df
# -d = include untracked directories
# -f = force deletion

Summary: The Modern Undoing Matrix