aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-02-22 20:42:46 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-02-22 20:42:46 -0300
commitebeea9d9e1f0c45d6ee134543048c643bbe4ac0f (patch)
tree2ae7d90507fdb338dd19fca7b2fab889caadd493
parent08f4a2f517a31742d4085eca6f59ec0054036593 (diff)
downloadapps-ebeea9d9e1f0c45d6ee134543048c643bbe4ac0f.tar.gz
apps-ebeea9d9e1f0c45d6ee134543048c643bbe4ac0f.tar.bz2
Updates submodules on inception merge
-rwxr-xr-xinception2
1 files changed, 1 insertions, 1 deletions
diff --git a/inception b/inception
index 3e7cb0a..7b844e1 100755
--- a/inception
+++ b/inception
@@ -83,5 +83,5 @@ elif [ "$1" == "version" ]; then
elif [ "$1" == "fetch" ]; then
( cd $DIRNAME && git fetch --all && git log -n 1 --branches=origin/master )
elif [ "$1" == "merge" ]; then
- ( cd $DIRNAME && git merge origin/master )
+ ( cd $DIRNAME && git merge origin/master && git submodule update --init --recursive )
fi