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

Re: subtree woes

From
HRHerman van Rink <rink@initfour.nl>
Date
Jun 7, 2012, 07:33 UTC
Message-ID
<4FD05964.9040102@initfour.nl>
In-Reply-To
<CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c=7jUnms7-Q@mail.gmail.com>
On 05-06-12 09:09, Paul Harris wrote:
Show 8 quoted lines
> Hello,
>
> I'm shifting my projects to use a subtree system, and I'm having some trouble.
> Looks like I'm hitting a subtree-merge bug, although I thought they
> were all fixed by now.
>
> I'm using cygwin, git 1.7.9 and apenwarr's git-subtrees repo.
> I've also tried git 1.7.10.msysgit.1 with apenwarr's git-subtrees.

Your origin/subtrees/zlib branch contains the zlib directory, not the just the contents of that directory.

Please have a look in the contrib/subtree folder of git-core. Work is ongoing to integrate apenwarr's code.

My latest stuff is in: https://github.com/helmo/git
-- 
Met vriendelijke groet / Regards,

Herman van Rink 
Initfour websolutions
Previous: Paul HarrisNext: Paul Harris
Message 2 of 3 in “subtree woes”
  1. Paul HarrisJun 5, 2012
  2. Herman van RinkJun 7, 2012
  3. Paul HarrisJun 5, 2012

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.