For reference, what would you say those bad defaults are? (I would like to know if I should consider changing my configuration)
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.)
> 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.
IshKebab · · focus · HN ↗
onetoo · · focus · HN ↗
IshKebab · · focus · HN ↗
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.)
coldpie · · focus · HN ↗
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.