From: Marco Costalba <mcostalba@gmail.com>
Date: Mon, 11 Feb 2008 07:55:07 GMT
Subject: Re: limiting rename detection during merge is a really bad idea
Message-ID: <e5bfff550802102355n3076ae6ax636e6c5635e6a0ab@mail.gmail.com>
In-Reply-To: <20080211074817.GA18898@sigill.intra.peff.net>

On Feb 11, 2008 8:48 AM, Jeff King <peff@peff.net> wrote:
>
> It may also be that multiple rename limits are appropriate. I don't mind
> waiting 30 seconds for rename detection during a particularly tricky
> merge. I probably do when running 'git-log -p'.
>

That's exactly my point: ignoring diff.renamelimit in case of merges.