ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor formatting, title consistency.

Margen67 2018-04-26 13:48:06 -07:00
parent f22680629d
commit 7d24ca139c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Updating-a-sub-moduled-Git-repository.md

@ -1,4 +1,6 @@
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. 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 ## Updating the Submodule Repository
From the sub-module directory (import/*) From the sub-module directory (import/*)
@ -8,4 +10,6 @@ git fetch upstream && git merge upstream/master
git push 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. 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.