From: Gabriel <g2p.code@gmail.com>
To: git@vger.kernel.org
Subject: Re: Canonical method of merging two projects
Date: Mon, 14 Apr 2008 06:56:25 +0000 (UTC) [thread overview]
Message-ID: <ftuv6o$vch$1@ger.gmane.org> (raw)
In-Reply-To: Pine.LNX.4.64.0804140733500.7014@ds9.cixit.se
Hello,
On Mon, 14 Apr 2008 07:37:17 +0100, Peter Karlsson wrote:
> What is the canonical way of merging an unrelated project into another
> so that all of the merged project's files appear in a sub-directory of
> the first?
>
> I have two projects, A with files "a.txt" and "b.txt", and B with files
> "a.txt" and "c.txt", each in a separate Git repoistory. I want to merge
> those two projects, throwing away the B repository, and achieve a file
> layout that has "a.txt" and "b.txt" from A, and "B/a.txt" and "B/c.txt"
> from B. I.e, the two files with the same name are unrelated, and all of
> B's file should end up in a sub-directory.
This is exactly what the subtree “merge strategy” does;
there is a HOWTO here:
http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
next prev parent reply other threads:[~2008-04-14 6:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-14 6:37 Canonical method of merging two projects Peter Karlsson
2008-04-14 6:56 ` Gabriel [this message]
2008-04-14 18:10 ` Eric Raible
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='ftuv6o$vch$1@ger.gmane.org' \
--to=g2p.code@gmail.com \
--cc=git@vger.kernel.org \
/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).