You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md
+5-5Lines changed: 5 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -15,7 +15,7 @@ If you maintain a tool that currently assumes the default branch of `rust-lang/r
15
15
16
16
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.
17
17
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].
19
19
20
20
## Renaming your fork's default branch
21
21
@@ -31,10 +31,10 @@ Here is how you can update your fork's default branch:
31
31
Execute the following git commands in your local checkout of the `rust` repository.
32
32
33
33
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.
35
35
- 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).
0 commit comments