aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xinception7
m---------metadot0
2 files changed, 6 insertions, 1 deletions
diff --git a/inception b/inception
index 3d536a3..2c0d2ff 100755
--- a/inception
+++ b/inception
@@ -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