From: Sergei Organov <osv@javad•com>
To: Jakub Narebski <jnareb@gmail•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 20:30:11 +0300 [thread overview]
Message-ID: <877ii17opo.fsf@osv.gnss.ru> (raw)
In-Reply-To: <m3fxwplw1i.fsf@roke.D-201> (Jakub Narebski's message of "Tue\, 22 Jan 2008 07\:23\:28 -0800 \(PST\)")
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
$
-- Sergei.
next prev parent reply other threads:[~2008-01-22 17:32 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 [this message]
2008-01-22 18:34 ` Jakub Narebski
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=877ii17opo.fsf@osv.gnss.ru \
--to=osv@javad$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jnareb@gmail$(echo .)com \
--cc=picca@synchrotron-soleil$(echo .)Fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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