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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html