From 35a719c17ab970b9d1ce243d38ebfb8adc6849bc Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 12 Oct 2018 13:32:58 +0000
Subject: [PATCH] Update utils/pull_subtrees.sh
---
utils/pull_subtrees.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/utils/pull_subtrees.sh b/utils/pull_subtrees.sh
index c01be3b4..1268c514 100755
--- a/utils/pull_subtrees.sh
+++ b/utils/pull_subtrees.sh
@@ -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 --ignore-joins "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master
+ git subtree pull --prefix src/${aDeps[$i, name]} --squash -m "pull from module" "git@gitlab.veremes.net:Development/vitis_apps/sources/${aDeps[$i, name]}.git" master
fi
done
fi
--
GitLab