add no-ff option to gitconfig