diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-25 14:47:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-25 14:47:45 (GMT) |
| commit | 7c30a3a3c321575ee8f3bd82b9e617456c2a7396 (patch) | |
| tree | f059afd9e7c3bc0cf35c3191ec603fb899fb6372 | |
| parent | fa3ac83af0edf958d26b246109db6e3d6d128d70 (diff) | |
| parent | bb33bb657efef38f98a780e5eb2341e34b4b9b27 (diff) | |
| download | CMake-7c30a3a3c321575ee8f3bd82b9e617456c2a7396.zip CMake-7c30a3a3c321575ee8f3bd82b9e617456c2a7396.tar.gz CMake-7c30a3a3c321575ee8f3bd82b9e617456c2a7396.tar.bz2 | |
Merge topic 'doc-dev-release'
bb33bb65 Help/dev: Add log step to 'release' branch instructions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1700
| -rw-r--r-- | Help/dev/maint.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Help/dev/maint.rst b/Help/dev/maint.rst index bdfb3d0..ec76479 100644 --- a/Help/dev/maint.rst +++ b/Help/dev/maint.rst @@ -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 |