FYI - if anyone is using this method and getting this error message:
fatal: refusing to merge unrelated histories
it’s because the default changed in git 2.9; see this SO question.
Add --allow-unrelated-histories to make the command work again:
git merge -X subtree=trellis/ --squash trellis/master --allow-unrelated-histories
