diff --git a/Updating-a-sub-moduled-Git-repository.md b/Updating-a-sub-moduled-Git-repository.md new file mode 100644 index 0000000..78bf17b --- /dev/null +++ b/Updating-a-sub-moduled-Git-repository.md @@ -0,0 +1,11 @@ +For Cxbx-Reloaded, we maintain our own forks of sub-moduled libraries. This allows us to integrate them nicely into our build process, while also providing the ability to easily synchronize upstream changes. + +## Updating the Submodule Repository +From the sub-module directory (import/*) +``` +git remote add upstream +git fetch upstream && git merge upstream/master +git push +``` + +At this point, our sub-module fork is synchronized with the latest upstream changes, but we still need to tell the Cxbx-Reloaded repository to use the new commits, to do this, use any git client of choice (or the command line) to stage the sub-module's directory, and commit/push as normal. \ No newline at end of file diff --git a/Updating-an-imported-repository-via-git-commands.md b/Updating-an-imported-repository-via-git-commands.md deleted file mode 100644 index 878e148..0000000 --- a/Updating-an-imported-repository-via-git-commands.md +++ /dev/null @@ -1,13 +0,0 @@ -Luke summarized it to this : - -> git remote add upstream https://github.com/crosire/d3d8to9 -> git fetch upstream -> git rebase upstream/master -> git push -f - -> Now our own submodule fork is updated to upstream with our own cxbx-r changes - -> then in the Cxbx-Reloaded root - -> git add import/d3d8to9 -> then git commit and git push as normal \ No newline at end of file