com php-src: ensure no merge commit during submodule update: README.RELEASE_PROCESS
| From: | Remi Collet | Date: | Tue, 28 Nov 2017 13:16:47 +0000 |
| Subject: | com php-src: ensure no merge commit during submodule update: README.RELEASE_PROCESS | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-100412@lists.php.net to get a copy of this message | ||
Commit: a942a8e1be51e394f9f4b366c859fa8b30a52e5c
Author: Remi Collet <remi@php.net> Tue, 28 Nov 2017 14:16:33 +0100
Parents: c4347f4f74585e4a8c3c218da7ae884e6a3cc64a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a942a8e1be51e394f9f4b366c859fa8b30a52e5c
Log:
ensure no merge commit during submodule update
Changed paths:
M README.RELEASE_PROCESS
Diff:
diff --git a/README.RELEASE_PROCESS b/README.RELEASE_PROCESS
index dac6b2c..bb08e5f 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;``