/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

3 votes174 views5 answers
Ubuntu install apache
Shell/Bash
0 vote168 views1 answer
Gem::LoadError : "ed25519 is not part of the bundle. Add it to your Gemfile."
Shell/Bash
0 vote172 views1 answer
Ubuntu --bind vs mount
Shell/Bash
0 vote178 views2 answers
Pushing existing project to github
Shell/Bash
0 vote148 views1 answer
Ubuntu gdm at login keyboard stop working
Shell/Bash
0 vote176 views1 answer
How to unmerge branch in git
Shell/Bash
1 vote183 views1 answer
Merge remote commits to local then push
Shell/Bash
9 votes197 views2 answers
Linux find and delete files with name
Shell/Bash
0 vote175 views1 answer
Sed repeat pattern
Shell/Bash
1 vote179 views1 answer
How to change fedora clock to 12 hour
Shell/Bash