From: Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
To: Bas Driessen <bas.driessen@xobas.com>
Cc: git@vger.kernel.org, Nicolas Sebrecht <nicolas.s.dev@gmx.fr>
Subject: Re: git file sharing/versioning.
Date: Tue, 5 Jan 2010 21:10:38 +0100 [thread overview]
Message-ID: <20100105201038.GA12942@vidovic> (raw)
In-Reply-To: <1262580426.9041.21.camel@ams.xobas.net>
The 04/01/10, Bas Driessen wrote:
> I have a project where I have 2 trees with several hundreds of files.
> Let's call them tree1 and tree2. Only a handful of files in tree2 are
> different. What is the best way to set this up in GIT? Basically most
> files in tree2 should act as a symbolic link to tree1. So if the file
> changes in tree 1, it automatically changes in tree 2. Obviously, I
> don't want to store everything double. Branching does not appear to be
> an option as changes in tree1 would not be visible in the tree2 branch.
Look at:
git merge --help
git rebase --help
git cherry-pick --help
--
Nicolas Sebrecht
next prev parent reply other threads:[~2010-01-05 20:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1262579824.9041.15.camel@ams.xobas.net>
[not found] ` <1262580346.9041.20.camel@ams.xobas.net>
2010-01-04 4:47 ` git file sharing/versioning Bas Driessen
2010-01-05 20:10 ` Nicolas Sebrecht [this message]
[not found] ` <1262732791.14714.7.camel@ams.xobas.net>
2010-01-06 19:42 ` Nicolas Sebrecht
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=20100105201038.GA12942@vidovic \
--to=nicolas.s.dev@gmx.fr \
--cc=bas.driessen@xobas.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).