aboutsummaryrefslogtreecommitdiff
path: root/inception
diff options
context:
space:
mode:
Diffstat (limited to 'inception')
-rwxr-xr-xinception4
1 files changed, 2 insertions, 2 deletions
diff --git a/inception b/inception
index 2c0d2ff..1ae9172 100755
--- a/inception
+++ b/inception
@@ -136,8 +136,8 @@ function inception_fetch {
# Merge
function inception_merge {
(
- cd $DIRNAME && $GIT merge origin/master && \\
- $GIT submodule sync --recursive && \\
+ cd $DIRNAME && $GIT merge origin/master && \
+ $GIT submodule sync --recursive && \
$GIT submodule update --init --recursive
)
}