# HG changeset patch # User Marin Jankovski <maxlazio@gmail.com> # Date 1421232027 -3600 # Wed Jan 14 11:40:27 2015 +0100 # Node ID 514b84f5011d5ad604c997ffd810f575b004b8fd # Parent 26c8c2756a6b8d82cd39f2b9cc8797c4bcc2c875 Use merge instead of cherry-pick. diff --git a/doc/release.md b/doc/release.md --- a/doc/release.md +++ b/doc/release.md @@ -39,11 +39,11 @@ git push origin 6-6-stable 6.6.0.omnibus ``` -- Make sure that the master branch has the latest CE stable tag +- Make sure that the master branch of omnibus-gitlab has the latest changes from the omnibus-gitlab CE stable branch ```shell git checkout master -git cherry-pick $(git rev-parse 6-6-stable) +git merge 6-6-stable ```