Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use default instead of master to reference the repository HEAD #423

Merged
merged 1 commit into from
May 24, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -8,8 +8,7 @@ help address your problem, evaluate changes, and guide you through your pull
requests.

By contributing to *fpm*, you certify that you own or are allowed to share the
content of your contribution under the
[fpm license](https://github.com/fortran-lang/fpm/blob/master/LICENSE).
content of your contribution under the [fpm license](LICENSE).

* [Style](#style)
* [Reporting a bug](#reporting-a-bug)
@@ -35,7 +34,7 @@ Before opening a bug report:
1. Check if the issue has already been reported
([issues](https://github.com/fortran-lang/fpm/issues)).
2. Check if it is still an issue or it has been fixed?
Try to reproduce it with the latest version from the master branch.
Try to reproduce it with the latest version from the default branch.
3. Isolate the problem and create a minimal test case.

A good bug report should include all information needed to reproduce the bug.
2 changes: 1 addition & 1 deletion manifest-reference.md
Original file line number Diff line number Diff line change
@@ -403,7 +403,7 @@ To use a specific upstream branch declare the *branch* name with

```toml
[dependencies]
toml-f = { git = "https://github.com/toml-f/toml-f", branch = "master" }
toml-f = { git = "https://github.com/toml-f/toml-f", branch = "main" }
```

Alternatively, reference tags by using the *tag* entry
2 changes: 1 addition & 1 deletion src/fpm/cmd/new.f90
Original file line number Diff line number Diff line change
@@ -347,7 +347,7 @@ subroutine cmd_new(settings)
&' # git repository. ',&
&' # ',&
&' # You can be specific about which version of a dependency you would ',&
&' # like. By default the latest master master branch is used. You can ',&
&' # like. By default the latest default branch is used. You can ',&
&' # optionally specify a branch, a tag or a commit value. ',&
&' # ',&
&' # So here are several alternates for specifying a remote dependency (you ',&