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

merge master into the subtree branches

From
Nico Schlömer <nico.schloemer@gmail.com>
Date
Jun 12, 2015, 06:27 UTC
Message-ID
<CAK6Z60ceAsaGkH9b=VLese=nEcCz7rDzsvCiKpfQHT9+jOd4eg@mail.gmail.com>
Hi everyone,

I have a large Git project which I would like to dissect into subprojects with their own repositories. Git subtrees are ideal for this task: I first

 * create a branch with the contents of only one subfoldergit subtree
split -P <name-of-folder> -b <name-of-new-branch>
and then
 * pull this branch into another repository.

For a transitional phase, I would like to have the subprojects read-only and sync them from master. The question is how to organize this. For every commit to master, I could of course perform the above procedure repeatedly for all subprojects, but this seems less then ideal since it does all the work all over again.

Is there a way to merge master into the subtree branches?

Cheers, Nico

Message 1 of 1 in “merge master into the subtree branches”
  1. Nico SchlömerJun 12, 2015

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.