$ git remote add gh-pages-upstream git://... $ git merge -s ours --no-commit gh-pages-upstream $ git read-tree --prefix=src/pages/ -u gh-pages-upstream $ git commit -m "..."