Add scripts to update the GitSetup directory via subtree snapshot instead of merging in the history. Import a snapshot matching what we already had. Then merge a new version.
GitSetup