On Mon, May 31, 2021 at 11:26 PM Felipe Contreras <felipe.contreras@xxxxxxxxx> wrote: > So the challenge is this: > > 1. Remove all the configuration that is not essential (just leave > user.name and user.email or equivalent) > 2. Pick 2 configurations you think you can't live without. You are not > allowed to change them afterwards. > 3. Every day you can add 1 additional configuration (and update it the > next day). > 4. The moment you add a 4th configuration you lose. > > Once you've lost, reply to this message with the configuration you could > not live without. +1 for merge.conflictstyle = diff3, rerere.enabled = true, and log.decorate = short from me. I noticed others already mentioned these. My favorites which no one has mentioned yet are rebase.autosquash = true and rebase.autostash = true. IMO these two really improve rebase's usability. cheers, -- David
