Skip to content

Commit

Permalink
Prepare to rename default branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
michalmuskala committed Sep 16, 2021
1 parent d010261 commit 8efa327
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Expand Up @@ -5,7 +5,7 @@ possible.
## Pull Requests
We actively welcome your pull requests.

1. Fork the repo and create your branch from `master`.
1. Fork the repo and create your branch from `main`.
2. Add tests for your code using [Common Test](https://erlang.org/doc/apps/common_test/basics_chapter.html).
3. If you've changed APIs, update the documentation.
4. Ensure the test suite passes using `rebar3 ct`.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -5,7 +5,7 @@ on:
- '*'
pull_request:
branches:
- master
- main
jobs:
build:
strategy:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -407,7 +407,7 @@ The [release process](./RELEASE.md) requires a few steps, updating the [CHANGELO
### Decision Documents
[Formatting Decisions](https://github.com/WhatsApp/erlfmt/blob/master/doc/Readme.md) documents are intended to explain our reasoning for making certain formatting decisions.
[Formatting Decisions](https://github.com/WhatsApp/erlfmt/blob/main/doc/Readme.md) documents are intended to explain our reasoning for making certain formatting decisions.
### License
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Expand Up @@ -2,7 +2,7 @@

The release process requires a few steps.

1. Update the [CHANGELOG.md](https://github.com/WhatsApp/erlfmt/blob/master/CHANGELOG.md) file.
1. Update the [CHANGELOG.md](https://github.com/WhatsApp/erlfmt/blob/main/CHANGELOG.md) file.
```
### v<major>.<minor>.<bugfix>
Expand Down
4 changes: 2 additions & 2 deletions doc/ErlangFormatterComparison.md
Expand Up @@ -181,7 +181,7 @@ The trailing comment is moved to the line above and the above comment is moved t
Other Erlang formatters have several configurable options, which can adjust the format.

`erlfmt` is very opinionated and only a single option that will change the format, `print-width` the maximum line length, which has a default of 100.
See the reasoning behind this decision [here](https://github.com/WhatsApp/erlfmt/blob/master/doc/FormattingDecisionDefaultWidth.md).
See the reasoning behind this decision [here](https://github.com/WhatsApp/erlfmt/blob/main/doc/FormattingDecisionDefaultWidth.md).

## Preserving Representation

Expand Down Expand Up @@ -328,7 +328,7 @@ x() -> Foo = [short, list].
Adding a comment to the top of the file `%%% % @format` and running `erlfmt` with the `--require-pragma` option, will result in only files that have this comment will be formatted.

Adding a comment `%% erlfmt-ignore` above a top level expression, will skip over this single expression and continue to format the rest of the file.
[Here](https://github.com/WhatsApp/erlfmt/blob/master/doc/FormattingDecisionIgnore.md) you can see the reasoning behind including this option.
[Here](https://github.com/WhatsApp/erlfmt/blob/main/doc/FormattingDecisionIgnore.md) you can see the reasoning behind including this option.

## Speed

Expand Down
2 changes: 1 addition & 1 deletion test/erlfmt_format_SUITE.erl
Expand Up @@ -810,7 +810,7 @@ binary_operator_more(Config) when is_list(Config) ->

%% These formattings might not be exactly what we want in some cases,
%% see our reasoning for why we stuck to this format here:
%% https://github.com/WhatsApp/erlfmt/blob/master/doc/FormattingDecisionAssociative.md
%% https://github.com/WhatsApp/erlfmt/blob/main/doc/FormattingDecisionAssociative.md
binary_operator_equal(Config) when is_list(Config) ->
?assertFormat(
"A = B = c(\n"
Expand Down

0 comments on commit 8efa327

Please sign in to comment.