/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

8 votes138 views2 answers
Updated gitignore not working
Shell/Bash
12 votes137 views2 answers
Pip install bootstrap
Shell/Bash
0 vote145 views1 answer
Bashrc file location in linux
Shell/Bash
3 votes140 views2 answers
How to generate ssh key in ubuntu
Shell/Bash
25 votes141 views2 answers
Git revert to origin
Shell/Bash
1 vote259 views1 answer
List all built-in commands you can run in linux
Shell/Bash
1 vote167 views1 answer
Force logrotate linux
Shell/Bash
0 vote145 views1 answer
How to set up git in linux terminal
Shell/Bash
0 vote143 views1 answer
Does git bash have bashrc
Shell/Bash
11 votes162 views3 answers
Conda install tensorboard
Shell/Bash