Просмотр исходного кода

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.
Brad King 8 лет назад
Родитель
Сommit
bb33bb657e
1 измененных файлов с 7 добавлено и 0 удалено
  1. 7 0
      Help/dev/maint.rst

+ 7 - 0
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