From: Jed Brown <jed@59a2.org>
Date: Tue, 09 Apr 2013 15:08:24 GMT
Subject: Re: Teaching rerere about existing merges
Message-ID: <87k3ob7ndj.fsf@mcs.anl.gov>
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 ?

See src/contrib/rerere-train.sh and Junio's blog.

http://git-blame.blogspot.com/2012/04/rebuilding-git-integration-environment.html