From: Jeremy Rosen <jeremy.rosen@openwide.fr>
Date: Tue, 09 Apr 2013 15:20:01 GMT
Subject: Re: Teaching rerere about existing merges
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 -----
> 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
>