/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

2 votes268 views1 answer
Ionic cordova live reload
Shell/Bash
0 vote267 views1 answer
How to kill your pc
Shell/Bash
1 vote319 views1 answer
Letsencrypt auto renew nginx
Shell/Bash
1 vote291 views1 answer
Git grep across all branches
Shell/Bash
0 vote270 views1 answer
Pipe shell output to vim
Shell/Bash
0 vote325 views1 answer
Flow for vim
Shell/Bash
1 vote272 views1 answer
How to close sockets ubuntu
Shell/Bash
5 votes284 views1 answer
View host entires mac terminal
Shell/Bash
0 vote268 views1 answer
New branch contains old commit
Shell/Bash
-1 vote294 views2 answers
Cast audio to google home mini from pc linux
Shell/Bash