From: Alexey Feldgendler Date: Fri, 18 Feb 2011 14:49:10 GMT Subject: Re: Directory replaced with a file confuses cherry-pick Message-ID: In-Reply-To: <201102181544.06045.johan@herland.net> On Fri, 18 Feb 2011 15:44:05 +0100, Johan Herland wrote: > Unable to reproduce. Here are the commands I used (please post yours): I tried your exact script now, line by line, and it failed in the way I described. > This should not be the case. Which Git version are you using? git is from Debian testing, package version 1:1.7.2.3-2.2. -- Alexey Feldgendler Software Developer, Desktop Team, Opera Software ASA [ICQ: 115226275] http://my.opera.com/feldgendler/