Merge remote-tracking branch 'upstream/master' into proxy-auth
commit
6b3aa764e8
|
@ -62,16 +62,17 @@ Here are a few examples of valid tag names:
|
||||||
|
|
||||||
For every branch, a package development version will be created. If the branch
|
For every branch, a package development version will be created. If the branch
|
||||||
name looks like a version, the version will be `{branchname}-dev`. For example
|
name looks like a version, the version will be `{branchname}-dev`. For example
|
||||||
a branch `2.0` will get a version `2.0-dev`. If the branch does not look like
|
a branch `2.0` will get a version `2.0.x-dev` (the `.x` is added for technical
|
||||||
a version, it will be `dev-{branchname}`. `master` results in a `dev-master`
|
reasons, to make sure it is recognized as a branch, a `2.0.x` branch would also
|
||||||
version.
|
be valid and be turned into `2.0.x-dev` as well. If the branch does not look
|
||||||
|
like a version, it will be `dev-{branchname}`. `master` results in a
|
||||||
|
`dev-master` version.
|
||||||
|
|
||||||
Here are some examples of version branch names:
|
Here are some examples of version branch names:
|
||||||
|
|
||||||
1.0
|
1.x
|
||||||
1.*
|
1.0 (equals 1.0.x)
|
||||||
1.1.x
|
1.1.x
|
||||||
1.1.*
|
|
||||||
|
|
||||||
> **Note:** When you install a dev version, it will install it from source.
|
> **Note:** When you install a dev version, it will install it from source.
|
||||||
See [Repositories](05-repositories.md) for more information.
|
See [Repositories](05-repositories.md) for more information.
|
||||||
|
@ -79,7 +80,7 @@ See [Repositories](05-repositories.md) for more information.
|
||||||
### Aliases
|
### Aliases
|
||||||
|
|
||||||
It is possible alias branch names to versions. For example, you could alias
|
It is possible alias branch names to versions. For example, you could alias
|
||||||
`dev-master` to `1.0-dev`, which would allow you to require `1.0-dev` in all
|
`dev-master` to `1.0.x-dev`, which would allow you to require `1.0.x-dev` in all
|
||||||
the packages.
|
the packages.
|
||||||
|
|
||||||
See [Aliases](articles/aliases.md) for more information.
|
See [Aliases](articles/aliases.md) for more information.
|
||||||
|
|
Loading…
Reference in New Issue