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

Re: git-rerere: Usage question

From
Mike Hommey <mh@glandium.org>
Date
May 24, 2008, 07:54 UTC
Message-ID
<20080524075436.GA4377@glandium.org>
In-Reply-To
<7vwslkpo1o.fsf@gitster.siamese.dyndns.org>
On Fri, May 23, 2008 at 05:02:11PM -0700, Junio C Hamano wrote:
> These days, rerere is pretty much automatic in that rerere is called
> automatically from places that generate conflicts (e.g. "git merge") for
> purpose of (1), and from places that the user tells git that the conflicts
> are now resolved (e.g. "git commit") for purpose of (2).

Note that it is not totally automatic for most people because the default is to enable only if the .git/rr_cache directory exists, and neither git init nor git clone create this directory.

You still have to set rerere.enabled yourself.
Mike
Previous: Junio C HamanoNext: Dirk Süsserott
Message 3 of 4 in “git-rerere: Usage question”
  1. Dirk SüsserottMay 23, 2008
  2. Junio C HamanoMay 24, 2008
  3. Mike HommeyMay 24, 2008
  4. Dirk SüsserottMay 24, 2008

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.