Skip to content

Update default branch name of rust-lang/rust in subtree sync docs #16198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jieyouxu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update default branch name of rust-lang/rust in subtree sync docs #16198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions book/src/development/infrastructure/sync.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ to be run inside the `rust` directory):
```bash
git fetch upstream # assuming upstream is the rust-lang/rust remote
git switch rustup
git merge upstream/master --no-ff
git merge upstream/main --no-ff
```
> Note: This is one of the few instances where a merge commit is allowed in
> a PR.
Expand All @@ -99,7 +99,7 @@ to be run inside the `rust` directory):

All the following commands have to be run inside the `rust` directory.

1. Make sure you have checked out the latest `master` of `rust-lang/rust`.
1. Make sure you have checked out the latest `main` of `rust-lang/rust`.
2. Sync the `rust-lang/rust-clippy` master to the rust-copy of Clippy:
```bash
git switch -c clippy-subtree-update
Expand Down