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

Re: Question about rerere

From
Christian Neukirchen <chneukirchen@gmail.com>
Date
Nov 6, 2014, 16:41 UTC
Message-ID
<87oaske0y1.fsf@gmail.com>
In-Reply-To
<F9D7CE90-BED2-4694-B5DB-AE848C9F3F34@phare.normalesup.org>
Tristan Roussel <troussel@phare.normalesup.org> writes:
Show 11 quoted lines
> Hello,
>
> I’ve just learnt about rerere and it’s going to make my life so much
> easier, I have a question though.
>
> I enabled rerere very lately and I wanted to know if there was a way
> to feed rerere with old merge conflict resolutions (and if not, would
> it be considered a good feature request)? I’d like to do a rebase of
> my work because I unintentionally merged a branch I didn’t want and
> the merge is a bit far in the git history and I don’t want to
> re-resolve merge conflicts I had after that.
Have a look at contrib/rerere-train.sh.

(Which I learned from http://git-blame.blogspot.de/2012/04/rebuilding-git-integration-environment.html)

Ciao,
-- 
Christian Neukirchen  <chneukirchen@gmail.com>  http://chneukirchen.org
Previous: Tristan RousselNext: Thomas Adam
Message 2 of 4 in “Question about rerere”
  1. Tristan RousselNov 6, 2014
  2. Christian NeukirchenNov 6, 2014
  3. Thomas AdamNov 6, 2014
  4. Tristan RousselNov 6, 2014

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.