I'd like to add a subfolder of a public github repository into a subfolder of my own repository. I found a few solutions with git-sub-tree but there seems to be no way to pull changes from the original repository.
Is there a solution where I can merge changes from upstream?