git merge --no-ff --no-commit BRANCH