/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 vote140 views1 answer
Gitlab add remote upstream
Shell/Bash
0 vote150 views1 answer
Install serial port using npm
Shell/Bash
0 vote135 views1 answer
Cat from line to line
Shell/Bash
19 votes133 views2 answers
Github set branch upstream
Shell/Bash
3 votes136 views2 answers
Release a port in mac
Shell/Bash
0 vote148 views1 answer
Retrieve Linux command line history by date
Shell/Bash
3 votes109 views3 answers
Scikit-learn install
Shell/Bash
0 vote128 views1 answer
Powershell array of size
Shell/Bash
3 votes147 views2 answers
Kill all process that match in grep
Shell/Bash
1 vote135 views1 answer
Install wordpress theme
Shell/Bash