git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [rfc] flip rerere.enabled default to be "on" at Git 3.0 boundary?

From
D. Ben Knoble <ben.knoble@gmail.com>
Date
Oct 21, 2025, 21:37 UTC
Message-ID
<CALnO6CBJ7FQqa1JS5LoSqDa2KBHGZ=7KyUjQqNZWqHuq+nZOOA@mail.gmail.com>
In-Reply-To
<CALnO6CAjhgsGS-zoL_EQO0CXyg1gVH70TSqnbThNmJYarU71EQ@mail.gmail.com>
On Tue, Oct 21, 2025 at 5:36 PM D. Ben Knoble <ben.knoble@gmail.com> wrote:
Show 45 quoted lines
>
> On Tue, Oct 21, 2025 at 2:56 PM Kristoffer Haugsbakk
> <kristofferhaugsbakk@fastmail.com> wrote:
> >
> > On Tue, Oct 21, 2025, at 20:21, Junio C Hamano wrote:
> > > A good default matters, and people who find out how useful a rerere
> > > database is would say "gee, that sounds great but why they do not
> > > enable it by default?  It is too buggy and they wanted to reduce the
> > > number of support requests?"  Yes, the reason it is not enabled by
> > > default initially was exactly that, i.e. those opt into the feature
> > > was used as guinea pigs to polish the feature.  But we forgot to set
> > > the graduation criteria and never said "ok it is mature enough, so
> > > let's turn it on for everybody".
> > >
> > > Perhaps Git 3.0 boundary is a good occasion to do so?
> >
> > This sounds nice.
> >
> > Sometimes I make bad resolutions and my cache gets in the way.  But I
> > know it’s a directory or file somewhere that I can delete manually.  So
> > that’s nice.  And if I didn’t know I think I could have found it on
> > StackOverflow.
> >
> > I don’t think the “reused resolution” is super clear for things like
> > rebase and merge.  I will get output like
> >
> >       CONFLICT
> >       CONFLICT
> >       CONFLICT
> >       Reused recorded resolution for ...
> >       Reused recorded resolution for ...
> >       Reused recorded resolution for ...
> >       YOUR STUFF IS CONFLICTED
> >       DO THIS AND THAT
> >
> >       this is from memory :p
> >
> > And the “reused” messages are kind of “randomly” placed in the stderr
> > stream of consciousness.  Could they be colored maybe?
>
> Seconding this: it's too easy to miss the rerere messages, which can
> make other moments more confusing. (IIRC, git-status still says we
> need to "approve" the resolution, but for folks not used to rerere it
> might be obvious how to check the resolution? Idk, can't recall
> offhand.)

Premature send—the above said, I don't think it's anything against graduating rerere to default. Just that there will be some more edges to polish, which is a good thing.

-- 
D. Ben Knoble
Previous: D. Ben KnobleNext: Junio C Hamano
Message 4 of 12 in “[rfc] flip rerere.enabled default to be "on" at Git 3.0 boundary?”
  1. Junio C HamanoOct 21, 2025
  2. Kristoffer HaugsbakkOct 21, 2025
  3. D. Ben KnobleOct 21, 2025
  4. D. Ben KnobleOct 21, 2025
  5. Junio C HamanoOct 21, 2025
  6. Johannes SixtOct 22, 2025
  7. Ben KnobleOct 22, 2025
  8. Junio C HamanoOct 22, 2025
  9. D. Ben KnobleOct 23, 2025
  10. Junio C HamanoOct 23, 2025
  11. Ben KnobleOct 23, 2025
  12. Taylor BlauOct 21, 2025

Read the whole thread, see it on lore, or plain text.

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