Fix merging with submodules

.utils/subdir-helper.sh

@@ -16,7 +16,9 @@ temp=$(echo ${repo%/} | rev | cut -d/ -f1,2 | rev | tr / -)-${branch}
 fetch=_fetch-${temp}
 split=_split-${temp}-$(echo ${subdir} | tr / -)
 git fetch --no-tags ${repo} ${branch}:${fetch}
-git checkout --recurse-submodules ${fetch}
+git submodule deinit --all -f
+git checkout ${fetch}
 git subtree split -P ${subdir} -b ${split}
-git checkout --recurse-submodules ${prev}
+git checkout ${prev}
 git subtree ${action} -P ${path} ${split} -m "${action^} ${path} from ${repo}"
+git submodule update --init