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