On Wed, 2016-10-26 at 19:07 -0400, Matt McCutchen wrote: > Maybe we would never hit any of these problems in practice, but they > give me a bad enough feeling that I'm planning to write my own tool > that tracks the upstream commit ID in a file (like a submodule) and > doesn't generate any extra commits. Without generating extra commits, > the only place to store the upstream content in the superproject would > be in another subtree, which would take up disk space in every working > tree unless developers manually set skip-worktree. I think I prefer to > not store the upstream content and just have the tool fetch it from a > local subproject repository each time it's needed. > > I'll of course post the tool on the web and would be happy to see it > integrated into "git subtree" if that makes sense, but I don't know how > much time I'd be willing to put into making that happen. I have named my tool "git subtree-lite" and posted it here: https://mattmccutchen.net/utils/git-subtree-lite.git/ For now, please email any bug reports, enhancement requests, or proposed patches to me. I have philosophical concerns about hosting my own projects on services I don't control and practical concerns about a few "forge" apps that I looked into installing on my own web site, but if people are seriously interested in collaborating on this, I'll work something out. Matt