Embedded git repository that tracks our changes?

Question

Similar to git's submodule functionality, I'd like to embed a clone of a remote repository in my own. However, I would like the ability to make changes to our embedded version while still maintaining the ability to pull updates from the remote as well. I don't see how I can do this with a submodule. Is this functionally possible? Right now I just have the remote source directory copied into my repository and while that allows me to track my local changes, it loses the ability to pull updates from the remote repository or manage branches.

Answer 1

Depending on your situation you may want subtrees: http://help.github.com/subtree-merge/. You can pull and update the subtree in a Makefile or cron if you need to be up to date.