For reference, what would you say those bad defaults are? (I would like to know if I should consider changing my configuration)

There is a post[1] on the gitbutler blog where they collect a subset of defaults that allegedly git core developers use. It's where I got most of my config from.

[1] https://blog.gitbutler.com/how-git-core-devs-configure-git

Here are a few:

1. Git push should default to --force-with-lease --force-if-includes.

2. push.autoSetupRemote should be enabled by default.

3. The default conflict style should be zdiff3.

4. diff.submodule should be 'log' by default (gives much nicer submodule diffs).

5. Submodule updates / clones should be recursive by default. (There is a setting for this but I can't remember it.)

Also would be nice:

receive.denyCurrentBranch should be updateInstead by default (or at the very least mentioned in the help message, rather than it recommending ignore or warn or refuse, none of which do what is wanted)

> 3. The default conflict style should be zdiff3.

This one always baffled me. The default conflictstyle is so hard to read it's almost useless. Using diff3 is mandatory.

I hadn't heard of zdiff3, I'll give it a shot.

rerere should be on