@b0rk I mentioned commit.verbose already. I also like core.pager=cat (don't want it to auto-page), merge.conflictStyle=diff3 (I want to see what the merge base looks like when resolving conflicts), and I like to make an alias ff for "merge --ff-only"
I didn't know about init.defaultBranch, that's useful.