aboutsummaryrefslogtreecommitdiff
path: root/dev
diff options
context:
space:
mode:
authorEnrico Tassi2020-05-18 18:33:09 +0200
committerGitHub2020-05-18 18:33:09 +0200
commitffe1de0bab363902f3e9c517345713f74cfa3071 (patch)
tree4cf516bf3ce5c63479139dbc20014ffd5ed83322 /dev
parente1e4073f551c34cbaf5b510c3e2eaa11df8b095a (diff)
Update release-process.md
Diffstat (limited to 'dev')
-rw-r--r--dev/doc/release-process.md5
1 files changed, 3 insertions, 2 deletions
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