10up/Engineering-Best-Practices

Version Control -- suggest git.config for no-ff on master branch

krisgale-zz opened this issue · 2 comments

krisgale-zz commented

git config branch.master.mergeoptions "--no-ff"

dana-ross commented

I'm fine recommending this as an optional alternative to --no-ff if people want to do it. My personal preference is to build up the muscle memory to instinctively type --no-ff when you merge.

  • 👍2
tlovett1 commented

Agree on this one. Would love to see a PR!