On Thu, May 03, 2007 at 03:17:05PM +0200, marc.zonzon@xxxxxxxxx wrote: > I'm a git beginner (and an old user of cvs, and more recently of > subversion, and occasionally of arch) > > I'm very pleased with the decentralized character of git and the ease > to manage branches. But I have a usual problem that I don't know how > to solve properly in git. > > I have projects that draw some parts from two or three other > projects. But it is usually some small part, that are included, and > patched in my project. I want to follow the development of these fellow > projects. > > My problem is that I can of course get a branch to host a copy of the > project (if the are under git I can clone and pull, if not I use the > native scm to import and commit in the branch). But now I cannot merge > in my development branch as I include only a small part. > > I found no way to register that I copy these part. The only one I can think of, > is to have a script to extract a sub branch with only the appropriate > part and then pull from it (or push to my project). > i.e. I pull from the project (if git) or update in cvs, or ..., then I > filter to extract the appropiate part, then push to my development branch. > > But I suppose there are a lot of cleaner way to do it. And moreover > I'm quite sure that developers have met the same problem, and have solved it. > > Sorry to ask such a stupid question but > (1) git naming itself stupid content tracker encourage dumb people > like me to ask stupid questions . > (2) I tried to RTFM, but could not find the appropriate page. > > Thank you for any hint. Perhaps the newly added merge strategy subtree [1] could work. Or the just added subproject support, but this is very new and only the lowlevel machinery is implemented right now. -Peter [1]: http://git.kernel.org/?p=git/git.git;a=commit;h=68faf68938ee943fc251c702f2027e4dfda354db - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html