From e1e4073f551c34cbaf5b510c3e2eaa11df8b095a Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Mon, 18 May 2020 18:16:13 +0200
Subject: Update release-process.md

---
 dev/doc/release-process.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'dev')

diff --git a/dev/doc/release-process.md b/dev/doc/release-process.md
index af8a4737be..11f5e90a85 100644
--- a/dev/doc/release-process.md
+++ b/dev/doc/release-process.md
@@ -25,7 +25,9 @@ in time.
   the next branch point with the `--release` flag (see next section).
 - [ ] Put the corresponding alpha tag using `git tag -s`.
   The `VX.X+alpha` tag marks the first commit to be in `master` and not in the
-  branch of the previous version.
+  branch of the previous version. Note that you should tag a real commit,
+  not a merge one. After tagging double check that `git describe` picks up
+  the tag you just made (if not, you tagged the wrong commit).
 - [ ] Create the `X.X+beta1` milestone if it did not already exist.
 - [ ] Decide the release calendar with the team (freeze date, beta date, final
   release date) and put this information in the milestone (using the
-- 
cgit v1.2.3


From ffe1de0bab363902f3e9c517345713f74cfa3071 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Mon, 18 May 2020 18:33:09 +0200
Subject: Update release-process.md

---
 dev/doc/release-process.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'dev')

diff --git a/dev/doc/release-process.md b/dev/doc/release-process.md
index 11f5e90a85..da9f37f666 100644
--- a/dev/doc/release-process.md
+++ b/dev/doc/release-process.md
@@ -25,8 +25,9 @@ in time.
   the next branch point with the `--release` flag (see next section).
 - [ ] Put the corresponding alpha tag using `git tag -s`.
   The `VX.X+alpha` tag marks the first commit to be in `master` and not in the
-  branch of the previous version. Note that you should tag a real commit,
-  not a merge one. After tagging double check that `git describe` picks up
+  branch of the previous version. Note that this commit is the first commit
+  in the first PR merged in master, not the merge commit for that PR.
+  After tagging double check that `git describe` picks up
   the tag you just made (if not, you tagged the wrong commit).
 - [ ] Create the `X.X+beta1` milestone if it did not already exist.
 - [ ] Decide the release calendar with the team (freeze date, beta date, final
-- 
cgit v1.2.3