ensure no merge commit during submodule update

This commit is contained in:
Remi Collet 2017-11-28 14:16:33 +01:00
parent c4347f4f74
commit a942a8e1be

View file

@ -201,7 +201,8 @@ can be influenced by defining the environment variable TAR_OPTIONS='--format=gnu
``git submodule init;
git submodule update;
cd distributions;
git pull origin master;
git fetch;
git pull --rebase origin master;
cd ..;
git commit distributions;
git push;``