From: Remi Collet <remi@php.net>
Date: Tue, 28 Nov 2017 13:16:33 +0000 (+0100)
Subject: ensure no merge commit during submodule update
X-Git-Tag: php-7.3.0alpha1~929
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a942a8e1be51e394f9f4b366c859fa8b30a52e5c;p=php

ensure no merge commit during submodule update
---

diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS
index dac6b2c8bc..bb08e5faed 100644
--- a/README.RELEASE_PROCESS
+++ b/README.RELEASE_PROCESS
@@ -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;``