diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1cb3a4956..a5fd6947a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: branches: - - master + - main env: CARGO_INCREMENTAL: 0 CARGO_NET_RETRY: 10 @@ -207,7 +207,7 @@ jobs: uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: # Required to include the recently merged Crowdin PR - ref: master + ref: main - name: Notarize | Set up secrets env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5aaff0ebe..793dbbee5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -273,10 +273,10 @@ Once setup is complete, you can refer to VitePress documentation on the actual i This is our preferred process for opening a PR on GitHub: 1. Fork this repository -2. Create a branch off of `master` for your work: `git checkout -b my-feature-branch` +2. Create a branch off of `main` for your work: `git checkout -b my-feature-branch` 3. Make some changes, committing them along the way 4. When your changes are ready for review, push your branch: `git push origin my-feature-branch` -5. Create a pull request from your branch to `starship/master` +5. Create a pull request from your branch to `starship/main` 6. No need to assign the pull request to anyone, we'll review it when we can 7. When the changes have been reviewed and approved, someone will squash and merge for you diff --git a/README.md b/README.md index 4bae18de5..bd57539a2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

Starship – Cross-shell prompt

@@ -9,7 +9,7 @@

GitHub Actions workflow status

- English   Deutsch   Español   Français   Bahasa Indonesia   Italiano   日本語   Português do Brasil   Русский   Українська   Tiếng Việt   简体中文   繁體中文

+> [!WARNING] +> **The default branch has been renamed from `master` to `main`.** +> If you have a local clone, update it by running: +> +> ```sh +> git branch -m master main +> git fetch origin +> git branch -u origin/main main +> git remote set-head origin -a +> ``` + Starship with iTerm2 and the Snazzy theme
- Starship rocket icon + Starship rocket icon

## 📝 License Copyright © 2019-present, [Starship Contributors](https://github.com/starship/starship/graphs/contributors).
-This project is [ISC](https://github.com/starship/starship/blob/master/LICENSE) licensed. +This project is [ISC](https://github.com/starship/starship/blob/main/LICENSE) licensed. [alpine linux packages]: https://pkgs.alpinelinux.org/packages?name=starship [arch linux extra]: https://archlinux.org/packages/extra/x86_64/starship