/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

0 vote280 views1 answer
How to delete a folder in arch linux terminal
Shell/Bash
16 votes253 views1 answer
Delete container id
Shell/Bash
2 votes254 views1 answer
Fix failed to fetch in apt-get update
Shell/Bash
0 vote288 views3 answers
Bash adding floats
Shell/Bash
1 vote254 views3 answers
Delete from git history
Shell/Bash
46 votes263 views6 answers
Ssh copy from remote to local
Shell/Bash
3 votes262 views1 answer
Linux screen brightness command line
Shell/Bash
0 vote242 views1 answer
Pull everything git
Shell/Bash
0 vote250 views1 answer
Install RelayControl
Shell/Bash
0 vote257 views1 answer
Copying folders in git bash
Shell/Bash