.gitconfig

[branch]
    sort = -committerdate
[color]
    # Colorize as much as possible by default
    ui = auto
[core]
    # Global excludes config. Fits better in my head than the default paths
    excludesfile = "~/.gitexcludes"
[init]
    # New repos start with main, not master. Only works on Git 2.28+
    defaultBranch = main
[interactive]
    # Don't require mashing enter after eg 'y'/'n' prompts in eg --patch
    singleKey = true
[merge]
    # Smarter, newer merge conflict formatting that is laser focused while
    # still preserving things like "both parents deleted/added some identical
    # lines"
    conflictStyle = zdiff3
[pull]
    # Rebase by default when pull-merging
    rebase = true
[push]
    # Push all branches that exist on both ends, by default
    default = matching
    # Push annotated tags too, by default, when pushing branches
    # (tho I do not currently use annotated tags much...ugh)
    followTags = true
[rerere]
    # Record previously resolved conflicts, eg when rebasing.
    # (I thought this was on by default, but no?)
    enabled = true
[user]
    # Self-explanatory
    name = Jeff Forcier
    email = jeff@bitprophet.org