From: Herman van Rink <rink@initfour.nl>
To: Paul Harris <harris.pc@gmail.com>
Cc: Git Users <git@vger.kernel.org>
Subject: Re: subtree woes
Date: Thu, 07 Jun 2012 09:33:56 +0200 [thread overview]
Message-ID: <4FD05964.9040102@initfour.nl> (raw)
In-Reply-To: <CAMSUDdZAex23k7c94VaF7H9KuGxE01sFC6XCHq4c=7jUnms7-Q@mail.gmail.com>
On 05-06-12 09:09, Paul Harris wrote:
> 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
next prev parent reply other threads:[~2012-06-07 7:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAMSUDdYj=GJx3LwSq98bLLXpEDWjR9ssHi=rdh1Q=zopZzAm_w@mail.gmail.com>
[not found] ` <CAMSUDdZ0BX8E26haZ-V-Grm42PaWFm3eXuSAJBcUg1LFvis7mA@mail.gmail.com>
[not found] ` <CAMSUDdaKu7f+A3wwsWDOA1W071xunssixrWwCi1Uz21k4DFcBQ@mail.gmail.com>
2012-06-05 7:09 ` subtree woes Paul Harris
2012-06-07 7:33 ` Herman van Rink [this message]
2012-06-05 7:14 ` Paul Harris
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=4FD05964.9040102@initfour.nl \
--to=rink@initfour.nl \
--cc=git@vger.kernel.org \
--cc=harris.pc@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.