Subtree merging and you nuclearsquid.com · Originally posted on Pinboard

The clearest explanation I've found for git's subtree merge.