diff options
| author | bors <bors@rust-lang.org> | 2023-02-13 17:41:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-02-13 17:41:38 +0000 |
| commit | 63562a6854f1ec95f5e53936b5cec65a58aca1da (patch) | |
| tree | 09f661c91a53001666dec1c7229fc1dbf3780511 | |
| parent | ac60dcaa25aa7939ec39e0b1242d2099f2c8b4ab (diff) | |
| parent | 21433abceaf5b1929e416bfca8fb58473cf95efc (diff) | |
| download | rust-63562a6854f1ec95f5e53936b5cec65a58aca1da.tar.gz rust-63562a6854f1ec95f5e53936b5cec65a58aca1da.zip | |
Auto merge of #10334 - samueltardieu:book-warning-text, r=Manishearth
book: move warning to the right place changelog: none
| -rw-r--r-- | book/src/development/infrastructure/backport.md | 1 | ||||
| -rw-r--r-- | book/src/development/infrastructure/sync.md | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/book/src/development/infrastructure/backport.md b/book/src/development/infrastructure/backport.md index 15f3d1f0806..6920c4e4656 100644 --- a/book/src/development/infrastructure/backport.md +++ b/book/src/development/infrastructure/backport.md @@ -28,6 +28,7 @@ repository. You can do this with: ```bash # Assuming the current directory corresponds to the Rust repository $ git checkout beta +# Make sure to change `your-github-name` to your github name in the following command $ git subtree pull -p src/tools/clippy https://github.com/<your-github-name>/rust-clippy backport $ ./x.py test src/tools/clippy ``` diff --git a/book/src/development/infrastructure/sync.md b/book/src/development/infrastructure/sync.md index 5a0f7409a2e..02cfc11b55a 100644 --- a/book/src/development/infrastructure/sync.md +++ b/book/src/development/infrastructure/sync.md @@ -79,8 +79,7 @@ to be run inside the `rust` directory): `rustup check`. 3. Sync the changes to the rust-copy of Clippy to your Clippy fork: ```bash - # Make sure to change `your-github-name` to your github name in the following command. Also be - # sure to either use a net-new branch, e.g. `sync-from-rust`, or delete the branch beforehand + # Be sure to either use a net-new branch, e.g. `sync-from-rust`, or delete the branch beforehand # because changes cannot be fast forwarded and you have to run this command again. git subtree push -P src/tools/clippy clippy-local sync-from-rust ``` |