Skip to content

Commit

Permalink
chore(typo): rename master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikaple committed May 7, 2021
1 parent 9632567 commit 04ca821
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## PR Checklist
Please check if your PR fulfills the following requirements:

- [ ] The commit message follows our guidelines: https://github.com/Nikaple/nest-typed-config/blob/master/CONTRIBUTING.md
- [ ] The commit message follows our guidelines: https://github.com/Nikaple/nest-typed-config/blob/main/CONTRIBUTING.md
- [ ] Tests for the changes have been added (for bug fixes / features)
- [ ] Docs have been added / updated (for bug fixes / features)

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: CI

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build:
Expand Down
18 changes: 9 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Before you submit your Pull Request (PR) consider the following guidelines:
1. Make your changes in a new git branch:

```shell
git checkout -b my-fix-branch master
git checkout -b my-fix-branch main
```

1. Create your patch, **including appropriate test cases**.
Expand All @@ -90,14 +90,14 @@ Before you submit your Pull Request (PR) consider the following guidelines:
git push origin my-fix-branch
```

1. In GitHub, send a pull request to `nestjs:master`.
1. In GitHub, send a pull request to `nest-typed-config:main`.
* If we suggest changes then:
* Make the required updates.
* Re-run the Nest test suites to ensure tests are still passing.
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request):

```shell
git rebase master -i
git rebase main -i
git push -f
```

Expand All @@ -114,10 +114,10 @@ from the main (upstream) repository:
git push origin --delete my-fix-branch
```
* Check out the master branch:
* Check out the main branch:
```shell
git checkout master -f
git checkout main -f
```
* Delete the local branch:
Expand All @@ -126,10 +126,10 @@ from the main (upstream) repository:
git branch -D my-fix-branch
```
* Update your master with the latest upstream version:
* Update your main with the latest upstream version:
```shell
git pull --ff upstream master
git pull --ff upstream main
```
## <a name="rules"></a> Coding Rules
Expand Down Expand Up @@ -167,7 +167,7 @@ to read on GitHub as well as in various git tools.
Footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.
Samples: (even more [samples](https://github.com/Nikaple/nest-typed-config/commits/master))
Samples: (even more [samples](https://github.com/Nikaple/nest-typed-config/commits/main))
```
docs(changelog): update change log to beta.5
Expand Down Expand Up @@ -212,7 +212,7 @@ A detailed explanation can be found in this [document][commit-message-format].


[commit-message-format]: https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
[dev-doc]: https://github.com/Nikaple/nest-typed-config/blob/master/docs/DEVELOPER.md
[dev-doc]: https://github.com/Nikaple/nest-typed-config/blob/main/docs/DEVELOPER.md
[github]: https://github.com/Nikaple/nest-typed-config
[gitter]: https://gitter.im/Nikaple/nest-typed-config
[js-style-guide]: https://google.github.io/styleguide/jsguide.html
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a href="https://www.npmjs.com/package/nest-typed-config"><img src="https://img.shields.io/npm/l/nest-typed-config.svg" alt="Package License" /></a>
<a href="https://www.npmjs.com/package/nest-typed-config"><img src="https://img.shields.io/npm/dm/nest-typed-config.svg" alt="NPM Downloads" /></a>
<a href="https://www.npmjs.com/nestjs-config-module"><img src="https://github.com/Nikaple/nest-typed-config/workflows/CI/badge.svg" alt="CI" /></a>
<a href="https://coveralls.io/github/Nikaple/nest-typed-config?branch=master"><img src="https://coveralls.io/repos/github/Nikaple/nest-typed-config/badge.svg?branch=master#5" alt="Coverage" /></a>
<a href="https://coveralls.io/github/Nikaple/nest-typed-config?branch=main"><img src="https://coveralls.io/repos/github/Nikaple/nest-typed-config/badge.svg?branch=main" alt="Coverage" /></a>
</p>

## Features
Expand Down Expand Up @@ -158,7 +158,7 @@ export class AppService {
}
```

For a full example, please visit our [examples](https://github.com/Nikaple/nest-typed-config/tree/master/examples/basic) folder
For a full example, please visit our [examples](https://github.com/Nikaple/nest-typed-config/tree/main/examples/basic) folder


## API
Expand Down

0 comments on commit 04ca821

Please sign in to comment.