]> granicus.if.org Git - php/commitdiff
ensure no merge commit during submodule update
authorRemi Collet <remi@php.net>
Tue, 28 Nov 2017 13:16:33 +0000 (14:16 +0100)
committerRemi Collet <remi@php.net>
Tue, 28 Nov 2017 13:16:47 +0000 (14:16 +0100)
README.RELEASE_PROCESS

index dac6b2c8bca6ee6e2950b6cac1e7e0e34c1cd87e..bb08e5faed72bdd4a3ae41718bc2890d266d19e0 100644 (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;``