Skip to content

Instantly share code, notes, and snippets.

@andyg1
Created April 16, 2018 15:44
Show Gist options
  • Save andyg1/a24c94ce42064bc95b60bf70755637c6 to your computer and use it in GitHub Desktop.
Save andyg1/a24c94ce42064bc95b60bf70755637c6 to your computer and use it in GitHub Desktop.
Undo last commit
// as answer here: https://stackoverflow.com/questions/927358/how-to-undo-the-most-recent-commits-in-git
$ git commit -m "Something terribly misguided" (1)
$ git reset HEAD~ (2)
<< edit files as necessary >> (3)
$ git add ... (4)
$ git commit -c ORIG_HEAD (5)
/******
1) This is what you want to undo
2) This leaves your working tree (the state of your files on disk) unchanged but undoes the commit and leaves the changes you committed unstaged (so they'll appear as "Changes not staged for commit" in git status, and you'll need to add them again before committing). If you only want to add more changes to the previous commit, or change the commit message1, you could use git reset --soft HEAD~ instead, which is like git reset HEAD~ (where HEAD~ is the same as HEAD~1) but leaves your existing changes staged.
3) Make corrections to working tree files.
4) git add anything that you want to include in your new commit.
5) Commit the changes, reusing the old commit message. reset copied the old head to .git/ORIG_HEAD; commit with -c ORIG_HEAD will open an editor, which initially contains the log message from the old commit and allows you to edit it. If you do not need to edit the message, you could use the -C option.
********/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment