summaryrefslogtreecommitdiff
path: root/Building_the_X_Window_System.mdwn
diff options
context:
space:
mode:
authorgnadon <gnadon@web>2014-02-13 14:00:42 -0800
committerxorg <iki-xorg@freedesktop.org>2014-02-13 14:00:42 -0800
commitc6126ce3270a98ab5df51e22fe38d1619a80db86 (patch)
tree157a0fc00a56506a2f662f9c12c7288bded2eebb /Building_the_X_Window_System.mdwn
parente3cfbb0934f81af19f21347a7811a2523f74f236 (diff)
Add submodule development scenario
Diffstat (limited to 'Building_the_X_Window_System.mdwn')
-rw-r--r--Building_the_X_Window_System.mdwn8
1 files changed, 8 insertions, 0 deletions
diff --git a/Building_the_X_Window_System.mdwn b/Building_the_X_Window_System.mdwn
index fd09ca31..d7c3d89d 100644
--- a/Building_the_X_Window_System.mdwn
+++ b/Building_the_X_Window_System.mdwn
@@ -288,6 +288,14 @@ It may be that only the module has changed since the last update, or that both t
git pull --rebase
git submodule update
"""]]
+It may be that only the submodule has changed and that these changes should be picked-up by the module.
+[[!format txt """
+cd m4
+git pull origin master
+git status
+cd ..
+git commit -a -s
+"""]]
### Rolling back a module