From: Johan Herland <johan@herland.net>
To: Alexey Feldgendler <alexeyf@opera.com>
Cc: git@vger.kernel.org
Subject: Re: Directory replaced with a file confuses cherry-pick
Date: Fri, 18 Feb 2011 16:17:55 +0100 [thread overview]
Message-ID: <201102181617.55929.johan@herland.net> (raw)
In-Reply-To: <op.vq3sr8w956e9f9@xman.eng.oslo.osa>
(please don't cull the CC list when replying)
On Friday 18 February 2011, Alexey Feldgendler wrote:
> 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.
I'm going away for the weekend, so I can't investigate this right now. Could
you please retry with a more recent Git? Maybe someone else already knows
which patch might have fixed this issue?
Have fun! :)
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
next prev parent reply other threads:[~2011-02-18 15:18 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
2011-02-18 15:17 ` Johan Herland [this message]
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=201102181617.55929.johan@herland.net \
--to=johan@herland.net \
--cc=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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.