diff options
| author | flip1995 <philipp.krones@embecosm.com> | 2021-11-04 12:52:36 +0000 |
|---|---|---|
| committer | flip1995 <philipp.krones@embecosm.com> | 2021-11-04 12:52:36 +0000 |
| commit | 4d6c2cce0adbb5deeeffe7eac6a27aedcfe03437 (patch) | |
| tree | 2a4aff84542ee92b4f55100c39a20f4e0a0867b4 /src/tools/clippy/CONTRIBUTING.md | |
| parent | 4061c0407978a00c5c2518d898ad8406da28c106 (diff) | |
| parent | e18101137866b79045fee0ef996e696e68c920b4 (diff) | |
| download | rust-4d6c2cce0adbb5deeeffe7eac6a27aedcfe03437.tar.gz rust-4d6c2cce0adbb5deeeffe7eac6a27aedcfe03437.zip | |
Merge commit 'e18101137866b79045fee0ef996e696e68c920b4' into clippyup
Diffstat (limited to 'src/tools/clippy/CONTRIBUTING.md')
| -rw-r--r-- | src/tools/clippy/CONTRIBUTING.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/clippy/CONTRIBUTING.md b/src/tools/clippy/CONTRIBUTING.md index 4273fda4e64..97ff31b4bc5 100644 --- a/src/tools/clippy/CONTRIBUTING.md +++ b/src/tools/clippy/CONTRIBUTING.md @@ -262,7 +262,9 @@ to be run inside the `rust` directory): 2. Checkout the commit from the latest available nightly. You can get it using `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 + # 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 + # because changes cannot be fast forwarded git subtree push -P src/tools/clippy git@github.com:your-github-name/rust-clippy sync-from-rust ``` |