git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tomas Carnecky <tom@dbservice.com>
To: Patrick Doyle <wpdster@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git remote vs. submodules
Date: Thu, 11 Nov 2010 12:34:44 +0100	[thread overview]
Message-ID: <4CDBD4D4.1080607@dbservice.com> (raw)
In-Reply-To: <AANLkTinev0W7-mm9wXmnZwY6DxN0Y2X0hJdpBOgM_4q=@mail.gmail.com>

On 11/11/10 2:45 AM, Patrick Doyle wrote:
> Hello All,
> I was just reading about git remote and I started thinking to myself,
> "Gee, nothing I've read says that the remotes have to share a common
> ancestor.  I wonder what would happen if I added two independent
> repositories as remotes to a superproject?"
> 
> So I tried it in a very trivial case.  The first thing I learned was
> that I need to make the subprojects subdirectories of a top level
> .git-housing directory.  Or else, when I merge them in, everything in
> the top level of subproject1 gets mixed in with everything in the top
> level of subproject2.  So this doesn't seem to be a good solution for
> marrying arbitrary subprojects together.  But if I set up a library of
> subprojects properly, it seems like I could do this.
> 
> So now I'm wondering... has anybody else ever had thoughts along these
> lines?  Has anybody tried this?  Has anybody seen it work (or fail
> miserably)?
> 
> Why would I want to do this instead of using submodules?  I dunno.  It
> just came to mind when I started trying to understand what's really
> going on with remotes.  And I vaguely (and perhaps even correctly)
> recall there being some controversy regarding submodules when they
> were first introduced.

Are you maybe looking for a subtree merge?
http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html

tom

  reply	other threads:[~2010-11-11 11:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-11  1:45 git remote vs. submodules Patrick Doyle
2010-11-11 11:34 ` Tomas Carnecky [this message]
2010-11-11 14:44   ` Patrick Doyle
2010-11-11 15:00     ` Tomas Carnecky
2010-11-11 15:11       ` Patrick Doyle

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=4CDBD4D4.1080607@dbservice.com \
    --to=tom@dbservice.com \
    --cc=git@vger.kernel.org \
    --cc=wpdster@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).