Also fetch origin before merging master into the rustup branch

This commit is contained in:
Philipp Krones 2020-05-25 17:11:07 +02:00 committed by GitHub
parent 1a9ba3b2c2
commit 7a83eafd44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -183,8 +183,8 @@ to be run inside the `rust` directory):
`rust-clippy` repo (this has to be done in the Clippy repo, not in the
rust-copy of Clippy):
```bash
git fetch origin && git fetch upstream
git checkout sync-from-rust
git fetch upstream
git merge upstream/master
```
3. Open a PR to `rust-lang/rust-clippy` and wait for it to get merged (to