aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:10:19 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:10:19 -0300
commitb21f57a3214055c88dafc1fd9332d75bf82519bc (patch)
treee0b9182c39895fc19f0a4b4513e47d698e465bd0
parentad35aca0019ff3624f48f5148e2cffc2c0b58acc (diff)
downloadmetadot-b21f57a3214055c88dafc1fd9332d75bf82519bc.tar.gz
metadot-b21f57a3214055c88dafc1fd9332d75bf82519bc.tar.bz2
Sync submodules
-rwxr-xr-xmetadot6
1 files changed, 5 insertions, 1 deletions
diff --git a/metadot b/metadot
index b74e1a6..3c4f111 100755
--- a/metadot
+++ b/metadot
@@ -159,7 +159,11 @@ function metadot_fetch {
# Merge
function metadot_merge {
if [ -d "$DOT/.git" ]; then
- ( cd $DOT && $GIT merge origin/master && $GIT submodule update --init --recursive )
+ (
+ cd $DOT && $GIT merge origin/master && \\
+ $GIT submodule sync --recursive && \\
+ $GIT submodule update --init --recursive
+ )
fi
}