I wanted to undo a commit, but forgot how to do that.
[WayBack] undo – Can I delete a git commit but keep the changes – Stack Overflow mentions to use
git reset HEAD^
However, on Windows, the ^
caret is an escape character, so there you have to use a ~
tilde instead:
git reset HEAD~
The last one is used in [WayBack] Git – Reset Demystified, and shorthand for
git reset --mixed HEAD~
The differences between --soft
, --mixed
and --hard
is even better explained in [WayBack] The difference between git reset –mixed, –soft and –hard. From http://stackoverflow.com/questions/3528245/whats-the-difference-between-git-reset-mixed-soft-and-hard · GitHub.
In short:
--soft
keeps the changes of the undone commit in theindex
(or staging area)--mixed
(default) keeps the changes of the undone commit in the working directory--hard
deletes the changes
–jeroen