From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick <oinksocket@letterboxes.org>
Subject: Re: cherry-picking a commit clobbers a file which is a directory
 in the target commit
Date: Mon, 06 Sep 2010 10:50:00 +0100
Message-ID: <4C84B948.9040907@letterboxes.org>
References: <4C7FCE27.7000500@letterboxes.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: git@vger.kernel.org
To: unlisted-recipients:; (no To-header on input)
X-From: git-owner@vger.kernel.org Mon Sep 06 11:50:09 2010
Return-path: <git-owner@vger.kernel.org>
Envelope-to: gcvg-git-2@lo.gmane.org
Received: from vger.kernel.org ([209.132.180.67])
	by lo.gmane.org with esmtp (Exim 4.69)
	(envelope-from <git-owner@vger.kernel.org>)
	id 1OsYL0-0004gH-HY
	for gcvg-git-2@lo.gmane.org; Mon, 06 Sep 2010 11:50:06 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1750942Ab0IFJt7 (ORCPT <rfc822;gcvg-git-2@m.gmane.org>);
	Mon, 6 Sep 2010 05:49:59 -0400
Received: from udon.noodlefactory.co.uk ([80.68.88.167]:41782 "EHLO
	udon.noodlefactory.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1750890Ab0IFJt7 (ORCPT <rfc822;git@vger.kernel.org>);
	Mon, 6 Sep 2010 05:49:59 -0400
Received: from 87-194-154-6.bethere.co.uk ([87.194.154.6] helo=[192.168.0.102])
	by udon.noodlefactory.co.uk with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.69)
	(envelope-from <oinksocket@letterboxes.org>)
	id 1OsYKr-00025l-Ox
	for git@vger.kernel.org; Mon, 06 Sep 2010 10:49:57 +0100
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.11) Gecko/20100713 Lightning/1.0b1 Thunderbird/3.0.6
In-Reply-To: <4C7FCE27.7000500@letterboxes.org>
Sender: git-owner@vger.kernel.org
Precedence: bulk
List-ID: <git.vger.kernel.org>
X-Mailing-List: git@vger.kernel.org
Archived-At: <http://permalink.gmane.org/gmane.comp.version-control.git/155548>

I've been Warnocked.  Can anyone point me in the right direction?