title: How do I make git merge's default be --no-ff --no-commit?
body: <p>Company policy is to use <code>--no-ff</code> for merge commits. I personally like to adjust merge log messages so I use <code>--no-commit</code>. Plus I like to actually compile and test before I let the commit go.</p>
  
  <p>How do I make <code>--no-ff</code> and <code>--no-commit</code> the default for me for all branches?</p>
  
  <p>(and I've learned in the years since asking this, I almost always am happy with the commit, so it is simpler to allow it to commit by default and so long as I amend or otherwise fix things up before doing a push things are all good...)</p>