git-subtree is now included in the official git package