Reset all changes after last commit in git

Question

How can I undo every change made to my directory after the last commit, including deleting added files, resetting modified files, and adding back deleted files?

Solution 1

First, reset any changes

This will undo any changes you've made to tracked files and restore deleted files:

git reset HEAD --hard

Second, remove new files

This will delete any new files that were added since the last commit:

git clean -fd

Files that are not tracked due to .gitignore are preserved; they will not be removed

Warning: using -x instead of -fd would delete ignored files. You probably don't want to do this.

Solution 2

How can I undo every change made to my directory after the last commit, including deleting added files, resetting modified files, and adding back deleted files?

1. You can undo changes to tracked files with:

   git reset HEAD --hard
   

2. You can remove untracked files with:

   git clean -f
   

3. You can remove untracked files and directories with:

   git clean -fd
   

   but you can't undo change to untracked files.

4. You can remove ignored and untracked files and directories

   git clean -fdx
   

   but you can't undo change to ignored files.

You can also set clean.requireForce to false:

git config --global --add clean.requireForce false

to avoid using -f (--force) when you use git clean.