Created
January 28, 2014 20:52
-
-
Save zakelfassi/8676166 to your computer and use it in GitHub Desktop.
Rollback a `git commit`
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Undo a commit and redo | |
$ git commit ... (1) | |
$ git reset --soft 'HEAD^' (2) | |
$ edit (3) | |
$ git add .... (4) | |
$ git commit -c ORIG_HEAD (5) | |
This is what you want to undo | |
This is most often done when you remembered what you just committed is incomplete, or you misspelled your commit message, or both. Leaves working tree as it was before "reset". (The quotes may or may not be required in your shell) | |
Make corrections to working tree files. | |
Stage changes for commit. | |
"reset" copies the old head to .git/ORIG_HEAD; redo the commit by starting with its log message. If you do not need to edit the message further, you can give -C option instead. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment