From a942a8e1be51e394f9f4b366c859fa8b30a52e5c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Tue, 28 Nov 2017 14:16:33 +0100
Subject: [PATCH] ensure no merge commit during submodule update

---
 README.RELEASE_PROCESS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;``
-- 
2.50.1