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?

possible duplicate of [Revert to previous Git commit](http://stackoverflow.com/questions/4114095/revert-to-previous-git-commit) — nawfal, Feb 09 '14 at 18:45
@nawfal may be a duplicate, but 'reset all changes after last commit' matches more searching criteria(words searched in google) than corresponding 'how to revert git repository'. At least for people like me who don't have English as their mother tongue :d — Shirish Herwade, Aug 04 '17 at 07:33

score 750 · Accepted Answer · edited Jul 16 '20 at 19:08

750

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.

edited Jul 16 '20 at 19:08

Jim U

3,318
1
14
24

answered Jan 07 '11 at 21:10

Benjamin Bannier

55,163
11
60
80

9

@Adam: You may sometimes want the `-x` option to `git clean` as well, which directs it to remove ignored files as well. – Cascabel Jan 08 '11 at 00:35
39

If you want to keep files that are not tracked due to .gitignore, be careful with the `git clean -fd` command. – bitsoflogic Sep 23 '14 at 13:12
4

@Levinaris: It is the other way around `git clean -fd` will not delete ignored files. `-x` will. – Robert Siemer Jan 13 '15 at 16:14
7

@RobertSiemer Actually, it can! If you have any folders composed entirely of ignored files it will remove those folders thus deleting ignored files. Consider a .gitignore file like the one here: http://stackoverflow.com/q/25554504/456645. In this example, assume some folders have no PHP files. `git clean -fd` will delete those folders and untracked files. Tested with git version 1.9.1 – bitsoflogic Jan 20 '15 at 17:24
@Levinaris: useful info! – Sounds like a bug in git, no? – Robert Siemer Jan 21 '15 at 16:45
2

@RobertSiemer I read this reply after I lost my ignored files – Zerquix18 Mar 29 '16 at 00:00
1

Tried the above command and my entire hard disk contents got deleted. Im unable to restore it anymore. Is there any ways to restore it back? – Sep 09 '16 at 11:29
@Learner: Only from backups, but that is orthogonal to git. – Benjamin Bannier Sep 09 '16 at 11:42
bad day...,my entire projects got deleted – Sep 09 '16 at 12:36
4

but why the second 'clean out' needed at all? – Shirish Herwade Aug 04 '17 at 09:44
2

I'm not upvoting this answer because it is on 444 and its look cool. – Siraj Alam Sep 21 '18 at 07:10
And I was shouting for 666. – Benjamin Bannier Sep 21 '18 at 13:50
@Learner am about to run the above commands, was that a joke about it deleting the entire disk contents ? – steven7mwesigwa Jan 31 '19 at 21:42

Ortomala Lokni · Answer 2 · 2018-12-30T20:19:22.753

106

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?

You can undo changes to tracked files with:
```
git reset HEAD --hard
```
You can remove untracked files with:
```
git clean -f
```
You can remove untracked files and directories with:
```
git clean -fd
```
but you can't undo change to untracked files.
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.

edited Dec 30 '18 at 20:19

answered Oct 30 '16 at 15:54

Ortomala Lokni

56,620
24
188
240

3

Awesome, just what I needed. Thanks for the comparison of all the relevant commands! – Marquee Jan 25 '17 at 16:56
`git reset HEAD --hard` seemed to be enough for me to undo changes to the latest commit. – Pathros May 07 '22 at 21:53

score -9 · Answer 3 · answered Aug 26 '19 at 11:46

-9

There are two commands which will work in this situation,

root>git reset --hard HEAD~1

root>git push -f

For more git commands refer this page

answered Aug 26 '19 at 11:46

RKS

445
4
14

6

`git push -f` is not related to the question and, in this scenario, is dangerous – mustache1up Feb 11 '20 at 22:19
2

This will remove the last commit from the remote repository, instead of dropping all changes *since* the last commit. – TheKodeToad Nov 26 '21 at 10:43
1

Please delete this answer, it does the opposite of what the OP asked, and thus unsafe. Deleting this answer will also restore your lost rep. – aggregate1166877 Sep 21 '22 at 03:18
1

this will delete all including the last commit too.. – Thameem Nov 07 '22 at 05:52

Reset all changes after last commit in git

3 Answers3

Linked

Related