From: Johannes Sixt <j.sixt@viscovery.net>
Date: Tue, 15 Jun 2010 06:23:55 GMT
Subject: Re: Amending a merge commit doesn't update the rerere cache
Message-ID: <4C171C7B.3060904@viscovery.net>
In-Reply-To: <AANLkTik50ayTQUnft4oD0Paqf-AuFWxGNdx_zZlHKFPg@mail.gmail.com>

Am 6/15/2010 1:04, schrieb Jay Soffian:
> Subject says it all, but I'll elaborate.
> 
> During the course of testing a merge, I'll sometimes realize there was
> a mistake and I'll amend the merge commit. Sadly this doesn't update
> the rerere cache.

There is

	git rerere forget that/conflicted/file

It definitely works as long as the conflict is still recorded in the
index; I'm not sure if it works after you have staged the updated resolution.

-- Hannes