Company policy is to use
for merge commits. I personally like to adjust merge log messages so I use
. Plus I like to actually compile and test before I let the commit go.
How do I make
the default for me for all branches?
(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...)