Subject: Re: tracking a file from another project in my own project

From: Sergei Organov <[email-masked]>
Date: Tue, 22 Jan 2008 20:30:11 +0300

Jakub Narebski <[email-masked]> writes:
> picca <[email-masked]> writes:
>> Junio C Hamano <[email-masked]> 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.