File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed
src/tools/rust-analyzer/docs/book/src/contributing Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -282,26 +282,27 @@ There are two sets of people with extra permissions:
282282## Synchronizing subtree changes
283283`rust-analyzer` is a [josh](https://josh-project.github.io/josh/intro.html) subtree of the [rust-lang/rust](https://github.com/rust-lang/rust)
284284repository. We use the [rustc-josh-sync](https://github.com/rust-lang/josh-sync) tool to perform synchronization between these two
285- repositories. You can find documentation of the tool [here](https://github.com/rust-lang/josh-sync?tab=readme-ov-file#performing-pull ).
285+ repositories. You can find documentation of the tool [here](https://github.com/rust-lang/josh-sync).
286286
287287You can install the synchronization tool using the following commands:
288288```
289289cargo install --locked --git https://github.com/rust-lang/josh-sync
290290```
291291
292- Both pulls (synchronize changes from rust-lang/rust into rust-analyzer) and pushes (synchronize
292+ Both pulls (synchronizing changes from rust-lang/rust into rust-analyzer) and pushes (synchronizing
293+ changes from rust-analyzer into rust-lang/rust) are performed from this repository.
293294changes from rust-analyzer to rust-lang/rust) are performed from this repository.
294295
295296Usually we first perform a pull, wait for it to be merged, and then perform a push.
296297
297298### Performing a pull
298- 1) Checkout a new branch that will be used to create a PR into rust-analyzer
299+ 1) Checkout a new branch that will be used to create a PR against rust-analyzer
2993002) Run the pull command
300301 ```
301302 rustc-josh-sync pull
302303 ```
3033043) Push the branch to your fork of `rust-analyzer` and create a PR
304- - If you have `gh` CLI installed, `rustc-josh-sync` can create the PR for you.
305+ - If you have the `gh` CLI installed, `rustc-josh-sync` can create the PR for you.
305306
306307### Performing a push
307308
You can’t perform that action at this time.
0 commit comments