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

Re: Teaching rerere about existing merges

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 9, 2013, 16:01 UTC
Message-ID
<7vd2u3u20c.fsf@alter.siamese.dyndns.org>
In-Reply-To
<504282025.1400346.1365517106800.JavaMail.root@openwide.fr>
Jeremy Rosen <jeremy.rosen@openwide.fr> writes:
> is there a way to "teach" rerere about existing merge commits, or do I 
> have to re-solve all the existing merge manually once ?
There is a tool that does the "re-solve manually" for you.

$ git ls-files | grep rerere-train contrib/rerere-train.sh

It uses your working tree to do its work, so you should first commit or stash whatever you are in the middle of doing before using it.

Previous: Jeremy Rosen
Message 4 of 4 in “Teaching rerere about existing merges”
  1. Jeremy RosenApr 9, 2013
  2. Jed BrownApr 9, 2013
  3. Jeremy RosenApr 9, 2013
  4. Junio C HamanoApr 9, 2013

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.