git merge specific commit without cherry pick