git merge from commit of another branch