From: Jakub Narebski <jnareb@gmail.com>
To: Sergei Organov <osv@javad.com>
Cc: picca <picca@synchrotron-soleil.fr>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: tracking a file from another project in my own project
Date: Tue, 22 Jan 2008 19:34:42 +0100 [thread overview]
Message-ID: <200801221934.43767.jnareb@gmail.com> (raw)
In-Reply-To: <877ii17opo.fsf@osv.gnss.ru>
Sergei Organov wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
>> picca <picca@synchrotron-soleil.Fr> writes:
>>> Junio C Hamano <gitster@pobox.com> wrote:
>
> [...]
>
>>>> Or "merge -s subtree".
>>>
>>> I read the git help merge -s explanation but I do not understand how
>>> it can help in my case.
>>
>> Using subtree merge strategy you can join histories of your project
>> and git.git, embedding git.git as a subdirectory like gitk and
>> git-gui are now in git.git. It is an alternative to using
>> submodules.
>
> Is subtree merge strategy documented?
>
> $ grep subtree Documentation/merge-strategies.txt
> $
Documentation/howto/using-merge-subtree.txt
But I agree that it should be also described, or at least mentioned
in Documentation/merge-strategies.txt
--
Jakub Narebski
Poland
prev parent reply other threads:[~2008-01-22 18:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-22 8:35 tracking a file from another project in my own project picca
2008-01-22 9:20 ` Junio C Hamano
2008-01-22 13:56 ` picca
2008-01-22 15:23 ` Jakub Narebski
2008-01-22 17:30 ` Sergei Organov
2008-01-22 18:34 ` Jakub Narebski [this message]
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=200801221934.43767.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=osv@javad.com \
--cc=picca@synchrotron-soleil.fr \
/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).