git-plus-plus

fix git merge without fast forward by git-plus.