what are your favourite git config options to set? Right now I only really have `git config push.autosetupremote true` and `git config init.defaultBranch main` set in my ~/.gitconfig, curious about what other people set

(diff algorithm patience? a custom diff/merge tool? enable rerere?)

Follow

@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.

Sign in to participate in the conversation
Computer Fairies

Computer Fairies is a Mastodon instance that aims to be as queer, friendly and furry as possible. We welcome all kinds of computer fairies!