Maybe I'm stupid, but gitster/git doesn't sound like the mainline for git.
Git Subtree merged into mainline git
21–30 of 39 posts
Re: Git Subtree merged into mainline git
#22Good explanations of subtree merge: http://progit.org/book/ch6-7.html http://help.github.com/subtree-merge/
git-subtree is not the same as a subtree merge. The author himself likes to point that out. A subtree merge is a one-time operation. git-subtree, on the other hand, enables you to continue to merge in upstream changes. You can also split the subtree (including it's history) from your repo and make it a standalone repository again.
Re: Git Subtree merged into mainline git
#23Maybe I'm stupid, but gitster/git doesn't sound like the mainline for git.
It's the account of Junio C Hamano who is the main maintainer of git
Re: Git Subtree merged into mainline git
#24Good explanations of subtree merge: http://progit.org/book/ch6-7.html http://help.github.com/subtree-merge/
git-subtree is not the same as a subtree merge. The author himself likes to point that out. A subtree merge is a one-time operation. git-subtree, on the other hand, enables you to continue to merge in upstream changes. You can also split the subtree (including it's history) from your repo and make it a standalone repository again.
Thank you for the clarification. Quoting the author:
“[Subtrees] are also not to be confused with using the subtree merge strategy. The main difference is that, besides merging the other project as a subdirectory, you can also extract the entire history of a subdirectory from your project and make it into a standalone project. Unlike the subtree merge strategy you can alternate back and forth between these two operations. If the standalone library gets updated, you can automatically merge the changes into your project; if you update the library inside your project, you can ‘split’ the changes back out again and merge them back into the library project.”
https://github.com/apenwarr/git-subtree/blob/master/git-subt...
I guess I will have to get used to the idea that linking external repositories is harder than Subversion externals :) Which have serious limitations, I know, but at least they are so simple.
Re: Git Subtree merged into mainline git
#25I've been trying out git subtree and I understand it's advantages. But I've wondered if there's a way to use it without adding the merge commits to the timeline when I update the subtree repository. Something similar to what git rebase does. (Maybe this is a dumb question and I'm not using git subtree right) :)
Re: Git Subtree merged into mainline git
#26It's been merged into the contrib/ directory, so it's not installed by default. Saying it's merged into the mainline has the connotation that it's available like any other tool, it isn't.
Re: Git Subtree merged into mainline git
#27Honestly I hope they actually do what the article title is suggesting and bring subtree into mainline. Congrats on making contrib Avery.
Re: Git Subtree merged into mainline git
#28I've never used git in-the-large, which may be why I don't understand: Why must some other library/module be part of my project? Why not reference and maintain the external lib/mod externally? We've been doing that for decades. It seems a solved problem. Bringing an external library within the fold of your project feels like unnecessary coupling.
Dependency control it is a solved problem. Which is why SVN has externals, Hg has hgsubs, and Git has submodules and now subtrees. This isn't a git-in-the-large problem, it's an almost-any-nontrivial-project problem. It only seems unnecessary 'till you've had it and tried to live without it. Bringing other libraries into my project is beneficial because then my build system is able to wrangle those just as easily as…
Sometimes when I'm at work I forget that not all languages have maven.
Re: Git Subtree merged into mainline git
#29I've never used git in-the-large, which may be why I don't understand: Why must some other library/module be part of my project? Why not reference and maintain the external lib/mod externally? We've been doing that for decades. It seems a solved problem. Bringing an external library within the fold of your project feels like unnecessary coupling.
It makes it a little easier to maintain one or more forks of some library. Without submodules, you must have a separate repo for that, and there's no clear connection to the repo of your particular project.
This gets even more fun when you have a second project that needs an incompatible fork of the same library.
Re: Git Subtree merged into mainline git
#30I hope to see Android's 'repo' tool improved to (optionally) make use of this.