Re: The git spring cleanup challenge

From: David Aguilar <davvid@gmail.com>
Date: Jun 1, 2021, 21:56 UTC
Message-ID: <CAJDDKr7AG_qs2ZmNCuS9zS0oqCT9cWU=CSCfxALEkGuLHBH=OQ@mail.gmail.com>
In-Reply-To: <60b5d281552d6_e359f20828@natae.notmuch>

On Mon, May 31, 2021 at 11:26 PM Felipe Contreras <felipe.contreras@gmail.com> wrote:

Show 12 quoted lines

> 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