diff options
| author | Milan Curcic <caomaco@gmail.com> | 2021-05-24 12:02:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 12:02:30 -0400 |
| commit | c0a2d9803892b160f2e5022ba4fab3e99dab716a (patch) | |
| tree | 2e7573b53808aaf7bf97ef4d51227e44bd131c84 | |
| parent | 7704c0063b70d2a8a0fbcb351dc470886f5802dc (diff) | |
| parent | d49ae3c5582b85113770bbc52e104063bf960d20 (diff) | |
| download | fpm-c0a2d9803892b160f2e5022ba4fab3e99dab716a.tar.gz fpm-c0a2d9803892b160f2e5022ba4fab3e99dab716a.zip | |
Merge pull request #423 from awvwgk/default-branch
Use default instead of master to reference the repository HEAD
| -rw-r--r-- | CONTRIBUTING.md | 5 | ||||
| -rw-r--r-- | manifest-reference.md | 2 | ||||
| -rw-r--r-- | src/fpm/cmd/new.f90 | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2cc1ffa..a4a2147 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. diff --git a/manifest-reference.md b/manifest-reference.md index 77ee2eb..cd79b0b 100644 --- a/manifest-reference.md +++ b/manifest-reference.md @@ -429,7 +429,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 diff --git a/src/fpm/cmd/new.f90 b/src/fpm/cmd/new.f90 index 5149bea..773d7a7 100644 --- a/src/fpm/cmd/new.f90 +++ b/src/fpm/cmd/new.f90 @@ -347,7 +347,7 @@ character(len=:,kind=tfc),allocatable :: littlefile(:) &' # 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 ',& |