/Shell/Bash/Checkout master with previous commit

Checkout master with previous commit

git checkout 307a5cd        # check out the commit that you want to reset to 
git checkout -b fixy        # create a branch named fixy to do the work
git merge -s ours master    # merge master's history without changing any files
git checkout master         # switch back to master
git merge fixy              # and merge in the fixed branch
git push                    # done, no need to force push!

Similar codes

1 vote224 views3 answers
Bash length of string
Shell/Bash
1 vote260 views1 answer
Git rebase fork
Shell/Bash
6 votes272 views6 answers
Brew install mongodb
Shell/Bash
0 vote235 views1 answer
Install keras anaconda jupyter notebook
Shell/Bash
0 vote247 views1 answer
Bash loop local variable
Shell/Bash
0 vote226 views1 answer
Ubuntu 14 Some index files failed to download. They have been ignored, or old ones used instead.
Shell/Bash
0 vote237 views1 answer
Create symbolic link linux apache
Shell/Bash
0 vote243 views1 answer
What does the dollar sign mean in bash
Shell/Bash
42 votes235 views6 answers
Create requirements.txt python
Shell/Bash
0 vote262 views1 answer
How do I push a repo that says allready exists
Shell/Bash