From: "Alexey Feldgendler" <alexeyf@opera.com>
To: git@vger.kernel.org
Subject: Re: Directory replaced with a file confuses cherry-pick
Date: Fri, 18 Feb 2011 15:49:10 +0100 [thread overview]
Message-ID: <op.vq3sr8w956e9f9@xman.eng.oslo.osa> (raw)
In-Reply-To: <201102181544.06045.johan@herland.net>
On Fri, 18 Feb 2011 15:44:05 +0100, Johan Herland <johan@herland.net>
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/
next prev parent reply other threads:[~2011-02-18 14:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-18 14:06 Directory replaced with a file confuses cherry-pick Alexey Feldgendler
2011-02-18 14:44 ` Johan Herland
2011-02-18 14:49 ` Alexey Feldgendler [this message]
2011-02-18 15:17 ` Johan Herland
2011-02-18 15:30 ` Nick
2011-02-18 20:00 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2011-02-18 14:24 Alexey Feldgendler
2011-02-18 14:27 ` Alexey Feldgendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=op.vq3sr8w956e9f9@xman.eng.oslo.osa \
--to=alexeyf@opera.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).