This is the setup, we have 2 areas a open area and a restricted area. the 2 networks are completely disconnected. We do most of the development in the open, however, there are things that both overlap and are unique in the restricted area.
Currently the restricted area is updated by copying over a checkout of the master branch, then using some diff tool to copy the changes, then check in. doing it this way means that the history is lost, as are the many other branches. To add to the mix, we do use subtrees in our open repo to separate certain modules., but that method wouldnt really work in the restricted area, as there is overlap
I can be certain that this isn’t the correct way to do this, but I’m not really sure what the best way to use git to make this happen.