On Saturday 16 December 2006 05:21 pm, Torgil Svensson wrote: > > With sparse (for example defined by 'src/*.h') or partial (for example > > defined by 'Documentation/') checkout you should be able to merge > > upstream... unless conflicts are in the not checked out part. > > This would be a great feature! Will this conflict with path shortcuts? > If so, we might consider two types of objects: "link" which cannot > merge upstream and "module" which can merge upstream and contains a > .git object repository. I hope there's ultimately one generic, expressive, and conceptually simple submodule/subproject paradigm that can be used in all of the various use cases. Multiple methods of achieving what a typical user of git might consider to be a single activity (aka use this other project's code) implies that user needs to learn more about how git works to select the correct method. A single and powerful mechanism that can naturally address the various use cases of submodules would seem to be preferable, IMHO. Steve - 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