Auto merge of #6148 - flip1995:release_doc, r=ebroto

Update release documentation

When updating the beta branch, we want to reset, instead of rebase. Otherwise we might produce again new commits on the beta branch, that aren't on the master branch.

changelog: none
This commit is contained in:
bors 2020-10-09 13:02:25 +00:00
commit ed2b457fbe

View file

@ -68,7 +68,7 @@ be updated.
```bash
# Assuming the current directory corresponds to the Clippy repository
$ git checkout beta
$ git rebase $BETA_SHA
$ git reset --hard $BETA_SHA
$ git push upstream beta
```