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

Re: Directory replaced with a file confuses cherry-pick

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 18, 2011, 20:00 UTC
Message-ID
<7vvd0hnmek.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4D5E907D.2090808@letterboxes.org>
Nick <oinksocket@letterboxes.org> writes:
Show 7 quoted lines
> 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
Isn't v1.7.4-rc0~101 a polished version of that one?
Previous: Nick
Message 6 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.