Loading .shell/funcs +5 −1 Original line number Diff line number Diff line Loading @@ -95,7 +95,11 @@ update_worktree() local original=`git rev-parse HEAD` if git merge --ff --no-edit $upstream origin/master; then git submodule sync --recursive git submodule update --init --recursive --depth=100 ${GIT_JOBS} git submodule update ${GIT_JOBS} \ --rebase \ --init \ --recursive \ --depth=100 foreach_submodule check_submodule else git reset $original Loading Loading
.shell/funcs +5 −1 Original line number Diff line number Diff line Loading @@ -95,7 +95,11 @@ update_worktree() local original=`git rev-parse HEAD` if git merge --ff --no-edit $upstream origin/master; then git submodule sync --recursive git submodule update --init --recursive --depth=100 ${GIT_JOBS} git submodule update ${GIT_JOBS} \ --rebase \ --init \ --recursive \ --depth=100 foreach_submodule check_submodule else git reset $original Loading