]> gitweb.fluxo.info Git - rhatto/apps.git/commitdiff
Updates submodules on inception merge
authorSilvio Rhatto <rhatto@riseup.net>
Wed, 22 Feb 2017 23:42:46 +0000 (20:42 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Wed, 22 Feb 2017 23:42:46 +0000 (20:42 -0300)
inception

index 3e7cb0ae0fdaa6987d1faa8fb07259b22ab38d44..7b844e142fbb98312aad37fbf344822bfeec20bb 100755 (executable)
--- 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