Re: The git spring cleanup challenge

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 1, 2021, 22:28 UTC
Message-ID: <xmqqzgw9qky5.fsf@gitster.g>
In-Reply-To: <CAJDDKr7AG_qs2ZmNCuS9zS0oqCT9cWU=CSCfxALEkGuLHBH=OQ@mail.gmail.com>

David Aguilar <davvid@gmail.com> writes:

> +1 for merge.conflictstyle = diff3, rerere.enabled = true, and
> log.decorate = short from me. I noticed others already mentioned
> these.

As the inventor of rerere, I agree on rerere.enabled. It was made opt-in only because I thought it was somewhat risky when the feature was introduced, but it has been stable and useful, and it is long overdue to be enabled by default.

I do not think of any downside with conflictstyle being diff3 (and think of only upside). As to log.decorate, I see it as mostly personal preference and the current default of "auto" seems more appropriate.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.