File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
book/src/development/infrastructure Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -79,7 +79,7 @@ to be run inside the `rust` directory):
7979 ` ` ` bash
8080 git fetch upstream # assuming upstream is the rust-lang/rust remote
8181 git switch rustup
82- git merge upstream/master --no-ff
82+ git merge upstream/main --no-ff
8383 ` ` `
8484 > Note: This is one of the few instances where a merge commit is allowed in
8585 > a PR.
@@ -99,7 +99,7 @@ to be run inside the `rust` directory):
9999
100100All the following commands have to be run inside the ` rust` directory.
101101
102- 1. Make sure you have checked out the latest ` master ` of ` rust-lang/rust` .
102+ 1. Make sure you have checked out the latest ` main ` of ` rust-lang/rust` .
1031032. Sync the ` rust-lang/rust-clippy` master to the rust-copy of Clippy:
104104 ` ` ` bash
105105 git switch -c clippy-subtree-update
You can’t perform that action at this time.
0 commit comments