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

[PATCH/RFC RESEND 0/2] git subtree: an alternative to git submodule

From
Avery Pennarun <apenwarr@gmail.com>
Date
May 8, 2009, 22:39 UTC
Message-ID
<1241822349-27470-1-git-send-email-apenwarr@gmail.com>
Hi all,

I first sent out this patch set a couple of weeks ago (http://article.gmane.org/gmane.comp.version-control.git/117612) and got a couple of positive comments, but no negative ones, so I'm guessing people haven't reviewed it as closely as I would have hoped :)

git subtree has these subcommands:
 - add: connect a given commit to a given subtree, basically using the
   occasionally-documented 'git read-tree --prefix; git commit' trick.
 - merge: a user-friendlier form of 'git merge -s subtree'
 - pull: likewise, but for git pull
 - split: (the magical part!) generate a new commit series from the given
   prefix, so you can submit subtree changes *back* to the upstream project
   you merged in the first place. 

Does anyone have any comments on what it would take to get the git subtree stuff accepted into git?

Thanks,
Avery
Avery Pennarun (2):
  Add 'git subtree' command for tracking history of subtrees
    separately.
  Automated test script for 'git subtree'.
 .gitignore       |    1 +
 Makefile         |    1 +
 command-list.txt |    1 +
 git-subtree.sh   |  435 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 subtree-test.sh  |  206 ++++++++++++++++++++++++++
 5 files changed, 644 insertions(+), 0 deletions(-)
 create mode 100755 git-subtree.sh
 create mode 100755 subtree-test.sh
Next: Avery Pennarun
Message 1 of 11 in “git subtree: an alternative to git submodule”
  1. 0/2 git subtree: an alternative to git submoduleAvery Pennarun, May 8, 2009
  2. 1/2 Add 'git subtree' command for tracking history of subtrees separately.Avery Pennarun, May 8, 2009
  3. 2/2 Automated test script for 'git subtree'.Avery Pennarun, May 8, 2009
  4. Avery PennarunMay 15, 2009
  5. Junio C HamanoMay 15, 2009
  6. Avery PennarunMay 15, 2009
  7. Ping YinMay 18, 2009
  8. Ping YinMay 18, 2009
  9. Avery PennarunMay 18, 2009
  10. Ping YinMay 19, 2009
  11. Jakub NarebskiMay 19, 2009

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.