aboutsummaryrefslogtreecommitdiff
path: root/metadot
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:14:35 -0300
committerSilvio Rhatto <rhatto@riseup.net>2017-08-20 14:14:35 -0300
commit43ef7027c755ce37c49660906ee8f4ac81eada4c (patch)
treeb1d53fc701275a030d0792b9f989f0439ca5fefc /metadot
parentb21f57a3214055c88dafc1fd9332d75bf82519bc (diff)
downloadmetadot-43ef7027c755ce37c49660906ee8f4ac81eada4c.tar.gz
metadot-43ef7027c755ce37c49660906ee8f4ac81eada4c.tar.bz2
Oops
Diffstat (limited to 'metadot')
-rwxr-xr-xmetadot4
1 files changed, 2 insertions, 2 deletions
diff --git a/metadot b/metadot
index 3c4f111..bc929f3 100755
--- a/metadot
+++ b/metadot
@@ -160,8 +160,8 @@ function metadot_fetch {
function metadot_merge {
if [ -d "$DOT/.git" ]; then
(
- cd $DOT && $GIT merge origin/master && \\
- $GIT submodule sync --recursive && \\
+ cd $DOT && $GIT merge origin/master && \
+ $GIT submodule sync --recursive && \
$GIT submodule update --init --recursive
)
fi