Merge pull request #2639 from rust-lang/tshepang/default-branch

update mentions of default branch of rust-lang/rust

Author: tshepang

src/contributing.md

@@ -153,7 +153,7 @@ We have [a chapter](git.md) on how to use Git when contributing to Rust.
 
 ### Keeping your branch up-to-date
 
-The CI in rust-lang/rust applies your patches directly against the current `main`,
+The CI in rust-lang/rust applies your patches directly against current `main`,
 not against the commit your branch is based on.
 This can lead to unexpected failures
 if your branch is outdated, even when there are no explicit merge conflicts.

src/conventions.md

@@ -165,7 +165,7 @@ individually using `./x fmt`.
 
 **No merges.** We do not allow merge commits into our history, other
 than those by bors. If you get a merge conflict, rebase instead via a
-command like `git rebase -i rust-lang/master` (presuming you use the
+command like `git rebase --interactive rust-lang/main` (presuming you use the
 name `rust-lang` for your remote).
 
 **Individual commits do not have to build (but it's nice).** We do not

src/external-repos.md

@@ -114,7 +114,7 @@ A `subtree pull` takes all changes since the last `subtree pull`
 from the tool repo and adds these commits to the rustc repo along with a merge commit that moves
 the tool changes into the specified directory in the Rust repository.
 
-It is recommended that you always do a push first and get that merged to the tool `main`/`master` branch.
+It is recommended that you always do a push first and get that merged to the default branch of the tool.
 Then, when you do a pull, the merge works without conflicts.
 While it's definitely possible to resolve conflicts during a pull, you may have to redo the conflict
 resolution if your PR doesn't get merged fast enough and there are new conflicts. Do not try to

src/getting-started.md

@@ -140,7 +140,7 @@ You can find the list of such PRs [here][abandoned-prs].
 If the PR has been implemented in some other way in the meantime, the `S-inactive` label
 should be removed from it.
 If not, and it seems that there is still interest in the change,
-you can try to rebase the pull request on top of the latest `master` branch and send a new
+you can try to rebase the pull request on top of the latest `main` branch and send a new
 pull request, continuing the work on the feature.
 
 [abandoned-prs]: https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3AS-inactive+is%3Aclosed

src/git.md

@@ -227,7 +227,7 @@ upstream/main`. The fix is to abort the rebase and use the correct branch instea
 
 ```console
 git rebase --abort
-git rebase -i upstream/main
+git rebase --interactive upstream/main
 ```
 
 <details><summary>Click here to see an example of rebasing over the wrong branch</summary>
@@ -388,7 +388,7 @@ Alternatively, you can sacrifice the commit history like this:
 
 ```console
 # squash all the changes into one commit so you only have to worry about conflicts once
-git rebase -i --keep-base main  # and squash all changes along the way
+git rebase --interactive --keep-base main  # and squash all changes along the way
 git rebase main
 # fix all merge conflicts
 git rebase --continue

src/rustdoc-internals/rustdoc-gui-test-suite.md

@@ -11,4 +11,4 @@ These use a NodeJS-based tool called [`browser-UI-test`] that uses [puppeteer] t
 [`browser-UI-test`]: https://github.com/GuillaumeGomez/browser-UI-test/
 [puppeteer]: https://pptr.dev/
 [rustdoc-gui-readme]: https://github.com/rust-lang/rust/blob/HEAD/tests/rustdoc-gui/README.md
-[goml-script]: https://github.com/GuillaumeGomez/browser-UI-test/blob/master/goml-script.md
+[goml-script]: https://github.com/GuillaumeGomez/browser-UI-test/blob/main/goml-script.md