Re: tracking a file from another project in my own project
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Jan 22, 2008, 18:34 UTC
- Message-ID
- <200801221934.43767.jnareb@gmail.com>
- In-Reply-To
- <877ii17opo.fsf@osv.gnss.ru>
Sergei Organov wrote:
Show 20 quoted lines
> 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