reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-01 07:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'doc-dev-release'

Browse Source 
bb33bb65 Help/dev: Add log step to 'release' branch instructions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1700
This commit is contained in:
Brad King 2018-01-25 14:47:41 +00:00 committed by Kitware Robot
commit 7c30a3a3c3
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Help/dev/maint.rst
View File

@ -73,6 +73,13 @@ Merge the ``release-$ver`` branch to ``master``:
git pull
git merge --no-ff release-$ver
Review new ancestry to ensure nothing unexpected was merged to either branch:
.. code-block:: shell
git log --graph --boundary origin/master..master
git log --graph --boundary origin/release..release-$ver
Publish both ``master`` and ``release`` simultaneously:
.. code-block:: shell