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

Re: Teaching rerere about existing merges

From
JRJeremy Rosen <jeremy.rosen@openwide.fr>
Date
Apr 9, 2013, 15:20 UTC
Message-ID
<1905484131.1403079.1365520801804.JavaMail.root@openwide.fr>
In-Reply-To
<87k3ob7ndj.fsf@mcs.anl.gov>
thanks a lot, that solves my problem.
I'm a bit suprised that it's not part of the git-rerere command but that's good enough for me...
    Cordialement
    Jérémy Rosen
fight key loggers : write some perl using vim
----- Mail original -----
Show 10 quoted lines
> 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 ?
> 
> See src/contrib/rerere-train.sh and Junio's blog.
> 
> http://git-blame.blogspot.com/2012/04/rebuilding-git-integration-environment.html
>
Previous: Jed BrownNext: Junio C Hamano
Message 3 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.