Question:
I tried to undo my commit in git. Is it dangerous to use git reset --hard HEAD~1?
What is the difference between different options for git reset?
Answer:
git reset does know five “modes”: soft, mixed, hard, merge and keep. I will start with the first three, since these are the modes you’ll usually encounter. After that you’ll find a nice little a bonus, so stay tuned.
Let’s assume you have a repository with a history akin to this:
|
1 2 3 4 5 6 7 |
7e05a95 (HEAD -> main) Update a e62add5 Update b ca9ae0a Update a 9b6060d Add c eebe372 Add b 947586a Add a |
Where the latest commit (7e05a95) contains these changes:
|
1 2 3 4 5 6 7 8 |
diff --git a/a b/a index b66ba06..28b68e2 100644 --- a/a +++ b/a @@ -1 +1 @@ -new content +new new content |
Now what would happen when you run git reset with the various different modes? Let’s find out!
soft
When using git reset --soft HEAD~1 you will remove the last commit from the current branch, but the file changes will stay in your working tree. Also, the changes will stay on your index, so following with a git commit will create a commit with the exact same changes as the commit you “removed” before.
How would this look like in practice? Like this:
|
1 2 3 4 5 6 7 |
> git reset --soft HEAD^ # Assuming HEAD points at 7e05a95 > git status On branch main Changes to be committed: (use "git restore --staged modified: a |
As you see the changes in file a are on the index, and ready to be committed again.
mixed
This is the default mode and quite similar to soft. When “removing” a commit with git reset HEAD~1 you will still keep the changes in your working tree but not on the index; so if you want to “redo” the commit, you will have to add the changes (git add) before commiting.
In practice the result might look like this:
|
1 2 3 4 5 6 7 8 9 10 |
> git reset --mixed HEAD^ # Assuming HEAD points at 7e05a95 > git status On branch main Changes not staged for commit: (use "git add (use "git restore modified: a no changes added to commit (use "git add" and/or "git commit -a") |
The changes of file a are still there but they’re not on the index.
hard
When using git reset --hard HEAD~1 you will lose all uncommited changes and all untracked files in addition to the changes introduced in the last commit. The changes won’t stay in your working tree so doing a git status command will tell you that you don’t have any changes in your repository.
Tread carefully with this one. If you accidentally remove uncommited changes which were never tracked by git (speak: committed or at least added to the index), you have no way of getting them back using git.
A practical example might look like this:
|
1 2 3 4 5 |
> git reset --hard HEAD^ # Assuming HEAD points at 7e05a95 > git status On branch main nothing to commit, working tree clean |
As you can see, no changes remain. Assuming you also had some uncommitted changes in the file b these would be lost too!
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
> echo 'some uncommitted changes' > b > git status On branch main Changes not staged for commit: (use "git add (use "git restore modified: b no changes added to commit (use "git add" and/or "git commit -a") > git reset --hard HEAD^ # Assuming HEAD points at 7e05a95 > git status On branch main nothing to commit, working tree clean |
Bonus
keep
git reset --keep HEAD~1 is an interesting and useful one. It only resets the files which are different between the current HEAD and the given commit. It aborts the reset if one or more of these files has uncommited changes. It basically acts as a safer version of hard.
Let’s revisit the example from before, where you had some uncommitted changes in b:
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 |
> echo 'some uncommitted changes' > b > git status On branch main Changes not staged for commit: (use "git add (use "git restore modified: b no changes added to commit (use "git add" and/or "git commit -a") > git reset --keep HEAD^ # Assuming HEAD points at 7e05a95 > git status On branch main Changes not staged for commit: (use "git add (use "git restore modified: b no changes added to commit (use "git add" and/or "git commit -a") |
You removed the changes in file a but retained the uncommitted changes in file b!
So to reiterate: “hard” will remove all changes while “keep” only removes changes from the reset commit(s).
Each of these modes is explained in depths in the git reset documentation.
Note
When doing git reset to remove a commit the commit isn’t really lost, there just is no reference pointing to it or any of it’s children. You can still recover a commit which was “deleted” with git reset by finding it’s SHA-1 key, for example with a command such as git reflog.