git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nick <oinksocket@letterboxes.org>
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 15:30:05 +0000	[thread overview]
Message-ID: <4D5E907D.2090808@letterboxes.org> (raw)
In-Reply-To: <op.vq3qtqtj56e9f9@xman.eng.oslo.osa>

On 18/02/11 14:06, Alexey Feldgendler wrote:
> I think I've found a bug. Here is how to reproduce.

It looks like one I found in 1.7.0.4 - for which Elijah Newren submitted some
patches, although I don't happen to know what their current status is.

  http://comments.gmane.org/gmane.comp.version-control.git/155147

N

  parent reply	other threads:[~2011-02-18 16:09 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
2011-02-18 15:30 ` Nick [this message]
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=4D5E907D.2090808@letterboxes.org \
    --to=oinksocket@letterboxes.org \
    --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 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).