Skip to content

Commit

Permalink
Auto merge of rust-lang#6148 - flip1995:release_doc, r=ebroto
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Oct 9, 2020
2 parents e87c028 + c85cb76 commit ed2b457
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doc/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```

Expand Down

0 comments on commit ed2b457

Please sign in to comment.