To add the files of a git repository within another git repository the trick is to add the subdirectory with a trailing slash:
git add my-subdir/
This makes sure the actual files in the directory are added. Otherwise the repo is added as a submodule.