From 7d24ca139c53cb959b3cd3445bb0a9e74da53557 Mon Sep 17 00:00:00 2001 From: Margen67 Date: Thu, 26 Apr 2018 13:48:06 -0700 Subject: [PATCH] Minor formatting, title consistency. --- Updating-a-sub-moduled-Git-repository.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Updating-a-sub-moduled-Git-repository.md b/Updating-a-sub-moduled-Git-repository.md index 78bf17b..360a5e2 100644 --- a/Updating-a-sub-moduled-Git-repository.md +++ b/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 From the sub-module directory (import/*) @@ -8,4 +10,6 @@ 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 +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