From 982c52501897e4489060ef7f204acd42821d1097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Sun, 2 Nov 2025 10:48:26 +0100 Subject: [PATCH 1/2] Recommend users to rename their fork's default branch --- .../renaming-the-default-branch-of-rust-lang-rust.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md b/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md index e727a5a77..d9d5af195 100644 --- a/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md +++ b/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md @@ -13,7 +13,7 @@ We will be renaming the default branch of the [rust-lang/rust repository](https: If you maintain a tool that currently assumes the default branch of `rust-lang/rust` is named `master`, using `HEAD` instead will work both before and after the rename. -After the rename, contributors will need to run the following commands in their local checkout of the repository, assuming that your remote registry is called `origin`: +After the rename, contributors will need to run the following commands in their local checkout of the repository, assuming that your upstream remote is called `origin`: ```bash git branch -m master main @@ -27,6 +27,8 @@ git remote prune origin If you have a fork of the `rust-lang/rust` repository on GitHub and would like to rename your default branch to match, you can follow [GitHub's instructions][github-how-to-rename]. +**We recommend you to rename the default branch of your fork.** If you do not do it, and you will some day type `git checkout master` from muscle memory, git will create a fresh `master` branch based on your fork's `master` branch, which will be outdated. This behavior can be quite confusing. + [github-change]: https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/ [github-tooling]: https://github.com/github/renaming From 3d3dae61ef25fb2de47bcba45556f63f4fe3e3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Mon, 3 Nov 2025 08:27:42 +0100 Subject: [PATCH 2/2] Reword suggestion Co-authored-by: Jake Goulding --- .../renaming-the-default-branch-of-rust-lang-rust.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md b/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md index d9d5af195..4727cd98c 100644 --- a/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md +++ b/content/inside-rust/renaming-the-default-branch-of-rust-lang-rust.md @@ -27,7 +27,7 @@ git remote prune origin If you have a fork of the `rust-lang/rust` repository on GitHub and would like to rename your default branch to match, you can follow [GitHub's instructions][github-how-to-rename]. -**We recommend you to rename the default branch of your fork.** If you do not do it, and you will some day type `git checkout master` from muscle memory, git will create a fresh `master` branch based on your fork's `master` branch, which will be outdated. This behavior can be quite confusing. +**We recommend renaming the default branch of your fork.** If you do not rename it and later run `git checkout master`, git will create a`master` branch based on your fork's outdated `master` branch. This behavior can be confusing. [github-change]: https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/