From: Jay Soffian <jaysoffian@gmail.com>
Date: Fri, 13 Aug 2010 17:19:47 GMT
Subject: Re: Status of conflicted files resolved with rerere
Message-ID: <AANLkTi=0dV54q6o3f-XrxKAHDKn8mhWFmsLDen_3+1G7@mail.gmail.com>
In-Reply-To: <AANLkTi=tVV5gL2b2LfXALXahzabJXzVjB5z9-OSztOMJ@mail.gmail.com>

On Thu, Aug 12, 2010 at 5:36 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
> That said, I've never had a problem where rerere did the wrong thing
> for me.  Maybe there could be an option to override it.

$ git config rerere.autoupdate true

j.