git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Directory replaced with a file confuses cherry-pick

From
AFAlexey Feldgendler <alexeyf@opera.com>
Date
Feb 18, 2011, 14:49 UTC
Message-ID
<op.vq3sr8w956e9f9@xman.eng.oslo.osa>
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/
Previous: Johan HerlandNext: Johan Herland
Message 3 of 6 in “Directory replaced with a file confuses cherry-pick”
  1. Alexey FeldgendlerFeb 18, 2011
  2. Johan HerlandFeb 18, 2011
  3. Alexey FeldgendlerFeb 18, 2011
  4. Johan HerlandFeb 18, 2011
  5. NickFeb 18, 2011
  6. Junio C HamanoFeb 18, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.