Hacker News new | ask | show | jobs
by xivSolutions 4843 days ago
Totally agree about 50% of the joy coming from learning to use git. Frustrating at times, but in the end, that's the kind of thing that keeps me learning to code!

If I understand correctly, the subtree workflow is a (relatively) newer thing, and there is an actual subtree command either newly added or soon-to-be added which simplifies things a little further.

I decided to learn the old, hard way before I started exploring the subtree command itself (prior to the addition of the command, my understanding is that "subtree" represented a merge strategy, from which evolved the subtree "workflow" and out of which a git contributor evolved a "command," which appears to have been added to git 1.7.11:

http://log.pardus.de/2012/08/modular-git-with-git-subtree.ht...

I will likely follow up at some point with a post on using the actual subtree command as well.