Commit 63074101 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Add --rebase to git-submodule-update call

parent bb3300a8
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -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