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

Re: git-subtree: directory mismatch

From
Nanako Shiraishi <nanako3@lavabit.com>
Date
Nov 24, 2009, 23:08 UTC
Message-ID
<20091125080812.6117@nanako3.lavabit.com>
In-Reply-To
<32541b130911241348s21e21fb8n12edf374e6a3c309@mail.gmail.com>
Quoting Avery Pennarun <apenwarr@gmail.com>
> Yup.  This is basically a bug in "git merge -s subtree": it guesses
> which subtree to merge into, rather than actually taking a prefix
> parameter.  I've been meaning to either submit a patch for this, or
> find a way to work around it.
Probably you can save time by using what was already done
http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=89021
-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
Previous: Avery PennarunNext: Avery Pennarun
Message 3 of 12 in “git-subtree: directory mismatch”
  1. Marc FournierNov 24, 2009
  2. Avery PennarunNov 24, 2009
  3. Nanako ShiraishiNov 24, 2009
  4. Avery PennarunNov 25, 2009
  5. Junio C HamanoNov 25, 2009
  6. Avery PennarunNov 25, 2009
  7. Junio C HamanoNov 25, 2009
  8. Johannes SchindelinNov 25, 2009
  9. Avery PennarunNov 25, 2009
  10. Björn SteinbrinkNov 25, 2009
  11. Avery PennarunNov 25, 2009
  12. Marc FournierNov 25, 2009

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.