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

[Avery Pennarun <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