diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh index b61243f92046f09a19039da27964d483620e68e2..c91905cf295d4a2fae8d09d55eaf96be2f637767 100755 --- a/utils/pull_subtrees.sh +++ b/utils/pull_subtrees.sh @@ -17,7 +17,7 @@ cd .. # Vitis echo "---- Pull vitis ----" -git subtree pull --prefix src/vitis --squash -m "pull vitis $vitisVersion" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion +git subtree pull --prefix src/vitis -m "pull vitis $vitisVersion" "git@gitlab.veremes.net:Development/vitis_apps/sources/vitis.git" $vitisVersion # Modules if [[ $depsCount > 0 ]]; then @@ -26,7 +26,7 @@ if [[ $depsCount > 0 ]]; then echo "---- Pull ${aDeps[$i, name]} ----" # Ajoute le dépôt - git subtree pull --prefix src/${aDeps[$i, name]} --squash -m "pull ${aDeps[$i, name]} ${aDeps[$i, version]}" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} + git subtree pull --prefix src/${aDeps[$i, name]} -m "pull ${aDeps[$i, name]} ${aDeps[$i, version]}" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" ${aDeps[$i, version]} fi done fi