Undo a commit and redo
$ git commit -m "Something terribly misguided"
$ git reset HEAD~
.. edit files as necessary ..
$ git add ...
$ git commit -c ORIG_HEAD
- This is what you want to undo.1$ git commit -m "Something terribly misguided"
- 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~ but leaves your existing changes staged.1$ git reset HEAD~
- Make corrections to working tree files.1edit files as necessary
- git add anything that you want to include in your new commit.1git add ...
- 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.1$ git commit -c ORIG_HEAD
1 Note, however, that you don’t need to reset to an earlier commit if you just made a mistake in your commit message. The easier option is to git reset (to upstage any changes you’ve made since) and then git commit –amend, which will open your default commit message editor pre-populated with the last commit message.
Beware however that if you have added any new changes to the index, using commit –amend will add them to your previous commit.