Merge branch 'master' of https://gitlab.utc.fr/picasoft/projets/dockerfiles

docker_test.sh

@@ -53,13 +53,13 @@ else
   echo "WARNING : directory does not exist ($1) ; will try to pull"
 fi
 
-echo -e "\n==== RESET HARD and pull Dockerfiles repository ===="
+echo -e "\n==== Pull Dockerfiles repository ===="
 echo -e "Using branch \033[31m $(git rev-parse --abbrev-ref HEAD)\e[0m, is this correct ? [y/N]"
 read ans
 
 if [ $ans == "y" ]; then
-  git reset --hard
   git pull
+  git restore --source=HEAD --staged --worktree -- $1
 else
   echo "Aborting."
   exit 0