From bb33bb657efef38f98a780e5eb2341e34b4b9b27 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 25 Jan 2018 09:44:04 -0500 Subject: Help/dev: Add log step to 'release' branch instructions Extend the maintainer guide with a reminder to self-review the new ancestry of the `release` and `master` branches to ensure that nothing unexpected was merged. --- Help/dev/maint.rst | 7 +++++++ 1 file changed, 7 insertions(+) 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 -- cgit v0.12