reset HEAD^

master reset HEAD^
Merge branch 'master' of https://github.com/shimpepe/git-study-repo