1412

How can I uncommit my last commit in git?

Is it

git reset --hard HEAD

or

git reset --hard HEAD^

?

4

8 Answers 8

2291

If you aren't totally sure what you mean by "uncommit" and don't know if you want to use git reset, please see "Revert to a previous Git commit".

If you're trying to understand git reset better, please see "Can you explain what "git reset" does in plain English?".


If you know you want to use git reset, it still depends what you mean by "uncommit". If all you want to do is undo the act of committing, leaving everything else intact, use:

git reset --soft HEAD^

If you want to undo the act of committing and everything you'd staged, but leave the work tree (your files) intact:

git reset HEAD^

And if you actually want to completely undo it, throwing away all uncommitted changes, resetting everything to the previous commit (as the original question asked):

git reset --hard HEAD^

The original question also asked it's HEAD^ not HEAD. HEAD refers to the current commit - generally, the tip of the currently checked-out branch. The ^ is a notation which can be attached to any commit specifier, and means "the commit before". So, HEAD^ is the commit before the current one, just as master^ is the commit before the tip of the master branch.

Here's the portion of the git-rev-parse documentation describing all of the ways to specify commits (^ is just a basic one among many).

13
  • 79
    @Jefromi: every answer in this question is totally wrong to emphasize --hard, the --soft, is necessary for it to be "uncommit last commit", a --hard will not only uncommit but also destroy your commit. I nearly destroyed a whole day's of work since I didn't recheck what --hard meant assuming 70+ answer wouldn't be wrong. Fortunately reflog saved my day, but it wouldn't have to be that way.
    – Lie Ryan
    Commented Apr 7, 2012 at 4:27
  • 27
    @jameshfisher It's the answer to the original question ("which of these two is it?") and there was a giant warning right underneath it. I'm editing, but... if you see a question that looks from the title like what you want, and you just blindly run the first command you see in the first answer, this is going to keep happening to you.
    – Cascabel
    Commented Jul 1, 2014 at 16:17
  • 10
    get reset --soft HEAD^ is what i was looking for!!! SO sweet, what is the term for putting changes into the current working head? or directory.
    – Mike Lyons
    Commented Dec 5, 2014 at 17:36
  • 15
    Note for zsh users: use git reset 'HEAD^'
    – vmarquet
    Commented May 5, 2018 at 17:35
  • 4
    What if your only commit local is the first commit?git reset --soft "HEAD^" fatal: ambiguous argument 'HEAD^': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]'
    – JDPeckham
    Commented Jan 21, 2019 at 18:42
666

git reset --soft HEAD^ Will keep the modified changes in your working tree.

git reset --hard HEAD^ WILL THROW AWAY THE CHANGES YOU MADE !!!

4
  • 6
    When I put: git reset --soft HEAD^ Git says me More? What it means? Commented Mar 31, 2021 at 3:28
  • @FernandoPie Did you find the ans?
    – Shad
    Commented Jul 15, 2021 at 5:31
  • I can't remember budy, but what iss the problem? Commented Jul 15, 2021 at 18:16
  • 7
    That's probably because your CLI interprets the "^" differently. Perhaps try put "HEAD^" in quotes?
    – Kenny
    Commented Oct 26, 2021 at 12:11
403

To keep the changes from the commit you want to undo

git reset --soft HEAD^

To destroy the changes from the commit you want to undo

git reset --hard HEAD^

You can also say

git reset --soft HEAD~2

to go back 2 commits.

Edit: As charsi mentioned, if you are on Windows you will need to put HEAD or commit hash in quotes.

git reset --soft "HEAD^"
git reset --soft "asdf"
4
  • 24
    git reset --soft HEAD^ More? More? fatal: ambiguous argument 'HEAD ': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git <command> [<revision>...] -- [<file>...]' What the heck? Why does nothing ever just work in git? I hate it. Commented Jun 27, 2015 at 6:07
  • 38
    @VioletGiraffe you are probably on windows and need to do git reset --soft "HEAD^"
    – charsi
    Commented Aug 17, 2016 at 13:49
  • 6
    Great answer, what I do is create in ~/.gitconfig add [alias] uncommit = reset --soft HEAD^ .... Then I can just write git uncommit and it will soft reset last commit
    – WoodyDRN
    Commented Aug 30, 2016 at 9:23
  • 3
    Windows tip: if you're too lazy to type in the additional quotes you can also use HEAD~ (e.g. git reset --soft HEAD~) which is exactly the same as "HEAD^" :)
    – ABVincita
    Commented Sep 21, 2016 at 1:41
181

If you want to revert the commit WITHOUT throwing away work, use the --soft flag instead of --hard

git reset --soft HEAD^

Be careful ! reset --hard will remove your local (uncommitted) modifications, too.

git reset --hard HEAD^

note: if you're on windows you'll need to quote the HEAD^ so

git reset --hard "HEAD^"
10
  • 4
    You don't have to quote the carat with the Git bash from msysgit. Commented Aug 11, 2011 at 13:02
  • 58
    tried this and just lost days of work here. read below for the soft version that will retain your work locally.
    – barclay
    Commented Mar 26, 2015 at 16:29
  • 21
    Note that this not only undoes the act of committing, but also throws away your changes. Commented May 3, 2015 at 23:25
  • 12
    Just as a note for anyone who has made the mistake of running this when they didn't want to discard the changes, your changes are not gone, they have just been hidden. You can undo this operation using git reset --hard HEAD@{1} to go back to where you just were. (HEAD@{1} means roughly "the commit I was just at 1 change ago", in this case the commit that you told Git you wanted to get rid of. Type git reflog to see all the recent changes.) Commented Dec 1, 2018 at 1:18
  • 2
    This doesn't remove uncommited modifications, this removes the whole commit with all the changes... Thankfully I could get my changes back using Soren's tip
    – Fabis
    Commented Jun 18, 2019 at 14:45
46

Just a note - if you're using ZSH and see the error

zsh: no matches found: HEAD^

You need to escape the ^

git reset --soft HEAD\^
0
33

If you commit to the wrong branch

While on the wrong branch:

  1. git log -2 gives you hashes of 2 last commits, let's say $prev and $last
  2. git checkout $prev checkout correct commit
  3. git checkout -b new-feature-branch creates a new branch for the feature
  4. git cherry-pick $last patches a branch with your changes

Then you can follow one of the methods suggested above to remove your commit from the first branch.

0
21

If you haven't pushed your changes yet use git reset --soft [Hash for one commit] to rollback to a specific commit. --soft tells git to keep the changes being rolled back (i.e., mark the files as modified). --hard tells git to delete the changes being rolled back.

1
  • 2
    I've just learned without ruining anything, that subsequent git reset --soft HEAD~ keeps rollin' back without an intervening commit. Fortunately, I push to a bare repository and recovered from that. Good to learn these things the non-destructive, recoverable way. Commented Aug 6, 2015 at 20:37
5

Be careful with that.

But you can use the rebase command

git rebase -i HEAD~2

A vi will open and all you have to do is delete the line with the commit. Also can read instructions that were shown in proper edition @ vi. A couple of things can be performed on this mode.

3
  • 2
    What is that in Be careful with that? Is it git reset? I would agree. Commented Aug 6, 2015 at 20:38
  • The rebase command. You can destroy the commit history with it.
    – Filipe
    Commented Aug 6, 2015 at 23:29
  • This didn't remove the commit. It removed the changes. I wanted to remove just the commit so I could add the commit to another branch. Commented Jun 23, 2020 at 16:06

Not the answer you're looking for? Browse other questions tagged or ask your own question.