Make git merge no fast forward as default