Created
March 12, 2015 11:53
-
-
Save carltondickson/28a90ccfed2f6b697aba to your computer and use it in GitHub Desktop.
Undo commit and push to the wrong branch
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
# Credit to http://www.iarp.ca/hobby/computing/36-git-committed-and-pushed-to-the-incorrect-branch | |
# Ensure you're in the branch that you commited to by accident. | |
git checkout master | |
# Reset the branch back one commit. | |
git reset --soft HEAD^ | |
# Stash the changes | |
git stash | |
# Checkout the branch it should be in | |
git checkout develop | |
# Apply the stash | |
git stash apply | |
# Commit the changes just as you did before, you will need to rewrite the message. | |
git commit......... | |
# Push the changes to our develop branch | |
git push origin develop | |
# Checkout the original branch | |
git checkout master | |
# Force push the commit deletion to the original branch. | |
git push --force origin master |
NICE JOB MAN,
Thank you! This really saved me.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Saved me several google searches...thank you!