Skip to content

Commit 23779cc

Browse files
committed
Apply review remarks
1 parent 94d5cd2 commit 23779cc

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ If you maintain a tool that currently assumes the default branch of `rust-lang/r
1515

1616
After the rename, contributors will need to run a few git commands in their local checkout of the repository to update. Note that the specific commands that should be executed might differ based on the way you use git and how your local checkout is configured. We provide a guide below that we think should work for most use-cases, but your mileage may vary.
1717

18-
Please try to follow the guide step-by-step, and if you run into any problems, feel free to ask in the [t-infra Zulip channel][infra-zulip].
18+
Please try to follow the guide step-by-step, and if you run into any problems, feel free to ask in this [Zulip channel][infra-help-zulip].
1919

2020
## Renaming your fork's default branch
2121

@@ -31,10 +31,10 @@ Here is how you can update your fork's default branch:
3131
Execute the following git commands in your local checkout of the `rust` repository.
3232

3333
Note that the instructions below make two assumptions:
34-
- They assume that you have a git remote called `upstream` that points to the `rust-lang/rust` repository and a remote called `origin` that points to your `<username>/rust` fork. Please update the commands accordingly if you use a different setup.
34+
- You have a git remote called `upstream` that points to the `rust-lang/rust` repository and a remote called `origin` that points to your `<username>/rust` fork. Please update the commands accordingly if you use a different setup.
3535
- You can find out which remotes you have configured using the `git remote -v` command.
36-
- They assume that your local `master` branch tracks the default branch of your *fork*, not the default branch of the *upstream* `rust-lang/rust` repository. If that is not the case, execute the commented `git branch` command instead.
37-
- You can find which remote is your local branch tracking e.g. using `git branch -vv --contains master`.
36+
- Your local `master` branch tracks the default branch of your *fork*, not the default branch of the *upstream* `rust-lang/rust` repository. If that is not the case, execute the commented `git branch` command instead.
37+
- You can find which remote your local `master` branch tracks by using `git branch -vv --contains master` (the tracked branch should be shown in square brackets).
3838

3939
```bash
4040
# Update the local branch name
@@ -59,4 +59,4 @@ git remote prune upstream
5959

6060
[github-tooling]: https://github.com/github/renaming
6161

62-
[infra-zulip]: (https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Renaming.20the.20master.20branch.20for.20rust-lang.2Frust/with/554094625)
62+
[infra-help-zulip]: (https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Help.20with.20updating.20rust-lang.2Frust.20default.20branch/with/554127642)

0 commit comments

Comments
 (0)