From: Jeff King <peff@github.com>
Date: Wed, 06 Apr 2011 21:46:11 GMT
Subject: Re: What's cooking in git.git (Apr 2011, #02; Wed, 6)
Message-ID: <20110406214610.GC18481@sigill.intra.peff.net>
In-Reply-To: <7v8vvni1t3.fsf@alter.siamese.dyndns.org>

On Wed, Apr 06, 2011 at 01:04:40PM -0700, Junio C Hamano wrote:

> * jk/maint-merge-rename-create (2011-03-25) 3 commits
>   (merged to 'next' on 2011-03-31 at b9bc9f1)
>  + merge: turn on rewrite detection
>  + merge: handle renames with replacement content
>  + t3030: fix accidental success in symlink rename

I think this was already your plan, but please hold off on merging this
to master. I got an off-list bug report that the top commit breaks a
cherry-pick on somebody's private repo, and I'm trying to track down the
exact reason.

-Peff