summaryrefslogtreecommitdiffstats
path: root/Help/dev/maint.rst
diff options
context:
space:
mode:
Diffstat (limited to 'Help/dev/maint.rst')
-rw-r--r--Help/dev/maint.rst7
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