From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 22 Feb 2017 23:42:46 +0000 (-0300)
Subject: Updates submodules on inception merge
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ebeea9d9e1f0c45d6ee134543048c643bbe4ac0f;p=rhatto%2Fapps.git

Updates submodules on inception merge
---

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