git reset HEAD~ --hard
git checkout remote
git revert HEAD^2~~..HEAD^2