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

Teaching rerere about existing merges

From
JRJeremy Rosen <jeremy.rosen@openwide.fr>
Date
Apr 9, 2013, 14:18 UTC
Message-ID
<504282025.1400346.1365517106800.JavaMail.root@openwide.fr>
Hello everybody
I have just discovered rerere which seems to be an awesome feature....

unfortunately I have been merging and resolving conflicts on my repository for quite some time and I will soon do a rebase that would greatly gain from using rerere...

is there a way to "teach" rerere about existing merge commits, or do I have to re-solve all the existing merge manually once ?

    Regards
    Jérémy Rosen
fight key loggers : write some perl using vim
Next: Jed Brown
Message 1 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.