/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 vote255 views1 answer
Ubunto END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE
Shell/Bash
1 vote284 views3 answers
Git rename
Shell/Bash
0 vote574 views1 answer
Remote: Permission to asfand005/test.git denied to asfand87.
Shell/Bash
0 vote365 views1 answer
Windows run powershell script from task scheduler
Shell/Bash
0 vote364 views1 answer
Add platform toolchain to linux
Shell/Bash
16 votes277 views1 answer
Retsrta nginx
Shell/Bash
0 vote264 views1 answer
Install ntfs support debian
Shell/Bash
2 votes269 views2 answers
Fsl flirt
Shell/Bash
0 vote269 views1 answer
What to never time in powershell
Shell/Bash
0 vote285 views1 answer
Batch multiline command
Shell/Bash