git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
SOSergei Organov <osv@javad.com>
Date
Jan 22, 2008, 17:30 UTC
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:
[...]
Show 8 quoted lines
>> > 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.
Previous: Jakub NarebskiNext: Jakub Narebski
Message 5 of 6 in “tracking a file from another project in my own project”
  1. piccaJan 22, 2008
  2. Junio C HamanoJan 22, 2008
  3. piccaJan 22, 2008
  4. Jakub NarebskiJan 22, 2008
  5. Sergei OrganovJan 22, 2008
  6. Jakub NarebskiJan 22, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.