diff options
-rwxr-xr-x | inception | 7 | ||||
m--------- | metadot | 0 |
2 files changed, 6 insertions, 1 deletions
@@ -22,6 +22,7 @@ function inception_init { cd $DIRNAME echo "Initializing submodules..." + $GIT submodule sync --recursive $GIT submodule update --init --recursive if [ ! -e "$HOME/.dotfiles" ]; then @@ -134,7 +135,11 @@ function inception_fetch { # Merge function inception_merge { - ( cd $DIRNAME && $GIT merge origin/master && $GIT submodule update --init --recursive ) + ( + cd $DIRNAME && $GIT merge origin/master && \\ + $GIT submodule sync --recursive && \\ + $GIT submodule update --init --recursive + ) } # Main diff --git a/metadot b/metadot -Subproject ad35aca0019ff3624f48f5148e2cffc2c0b58ac +Subproject b21f57a3214055c88dafc1fd9332d75bf82519b |