From: Sergei Organov <osv@javad.com>
Date: Tue, 22 Jan 2008 17:30:11 GMT
Subject: Re: tracking a file from another project in my own project
Message-ID: <877ii17opo.fsf@osv.gnss.ru>
In-Reply-To: <m3fxwplw1i.fsf@roke.D-201>

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.