From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 09 Apr 2013 16:01:23 GMT
Subject: Re: Teaching rerere about existing merges
Message-ID: <7vd2u3u20c.fsf@alter.siamese.dyndns.org>
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 ?

There is a tool that does the "re-solve manually" for you.

$ git ls-files | grep rerere-train
contrib/rerere-train.sh

It uses your working tree to do its work, so you should first commit
or stash whatever you are in the middle of doing before using it.