fix: fetch all release branches on CI

feat(package): update @semantic-release/commit-analyzer to version 7.0.0
BREAKING CHANGE: Regexp are not supported anymore for property matching in the `releaseRules` option. Regex are replaced by [globs](https://github.com/micromatch/micromatch#matching-features). For example `/core-.*/` should be changed to `'core-*'`.
2018-11-29 20:03:51 -05:00 · 2018-11-29 14:13:03 -05:00 · 2018-11-29 14:13:03 -05:00 · 2018-11-28 17:32:05 -05:00 · 2018-11-27 16:04:50 -05:00 · 2018-11-26 18:39:28 -05:00
64 changed files with 4518 additions and 924 deletions
@@ -7,11 +7,14 @@ node_js:
  - 10
  - 8

-# Trigger a push build on caribou and greenkeeper branches + PRs build on every branches
+# Trigger a push build on release and greenkeeper branches + PRs build on every branches
 # Avoid double build on PRs (See https://github.com/travis-ci/travis-ci/issues/1147)
 branches:
  only:
-    - caribou
+    - master
+    - next
+    - beta
+    - /^\d+(.\d+)?.x$/
    - /^greenkeeper.*$/

 # Retry install on fail to avoid failing a build on network/disk/external errors
@@ -5,10 +5,10 @@
    <img alt="Gitter" src="https://badges.gitter.im/semantic-release/semantic-release.svg">
  </a>
  <a href="https://travis-ci.org/semantic-release/semantic-release">
-    <img alt="Travis" src="https://img.shields.io/travis/semantic-release/semantic-release/caribou.svg">
+    <img alt="Travis" src="https://img.shields.io/travis/semantic-release/semantic-release/master.svg">
  </a>
  <a href="https://codecov.io/gh/semantic-release/semantic-release">
-    <img alt="Codecov" src="https://img.shields.io/codecov/c/github/semantic-release/semantic-release/caribou.svg">
+    <img alt="Codecov" src="https://img.shields.io/codecov/c/github/semantic-release/semantic-release/master.svg">
  </a>
  <a href="https://greenkeeper.io">
    <img alt="Greenkeeper" src="https://badges.greenkeeper.io/semantic-release/semantic-release.svg">
@@ -29,6 +29,9 @@
  <a href="https://www.npmjs.com/package/semantic-release">
    <img alt="npm next version" src="https://img.shields.io/npm/v/semantic-release/next.svg">
  </a>
+  <a href="https://www.npmjs.com/package/semantic-release">
+    <img alt="npm beta version" src="https://img.shields.io/npm/v/semantic-release/beta.svg">
+  </a>
 </p>

 **semantic-release** automates the whole package release workflow including: determining the next version number, generating the release notes and publishing the package.
@@ -44,6 +47,7 @@ This removes the immediate connection between human emotions and version numbers
 - New features and fixes are immediately available to users
 - Notify maintainers and users of new releases
 - Use formalized commit message convention to document changes in the codebase
+- Publish on different distribution channels (such as [npm dist-tags](https://docs.npmjs.com/cli/dist-tag)) based on git merges
 - Integrate with your [continuous integration workflow](docs/recipes/README.md#ci-configurations)
 - Avoid potential errors associated with manual releases
 - Support any [package managers and languages](docs/recipes/README.md#package-managers-and-languages) via [plugins](docs/usage/plugins.md)
@@ -16,7 +16,7 @@ if (!semver.satisfies(process.version, pkg.engines.node)) {
  console.error(
    `[semantic-release]: node version ${pkg.engines.node} is required. Found ${process.version}.

-See https://github.com/semantic-release/semantic-release/blob/caribou/docs/support/node-version.md for more details and solutions.`
+See https://github.com/semantic-release/semantic-release/blob/master/docs/support/node-version.md for more details and solutions.`
  );
  process.exit(1);
 }
@@ -19,7 +19,7 @@ module.exports = async () => {
 Usage:
  semantic-release [options] [plugins]`);
    })
-    .option('b', {alias: 'branch', describe: 'Git branch to release from', type: 'string', group: 'Options'})
+    .option('b', {alias: 'branches', describe: 'Git branches to release from', ...stringList, group: 'Options'})
    .option('r', {alias: 'repository-url', describe: 'Git repository URL', type: 'string', group: 'Options'})
    .option('t', {alias: 'tag-format', describe: 'Git tag format', type: 'string', group: 'Options'})
    .option('p', {alias: 'plugins', describe: 'Plugins', ...stringList, group: 'Options'})
@@ -1,2 +0,0 @@
-codecov:
-  branch: caribou
@@ -123,11 +123,12 @@ Type: `Object`

 Information related to the last release found:

-| Name    | Type     | Description                                                                                        |
-|---------|----------|----------------------------------------------------------------------------------------------------|
-| version | `String` | The version of the last release.                                                                   |
-| gitHead | `String` | The sha of the last commit being part of the last release.                                         |
-| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the last release. |
+| Name    | Type     | Description                                                                                                                         |
+|---------|----------|-------------------------------------------------------------------------------------------------------------------------------------|
+| version | `String` | The version of the last release.                                                                                                    |
+| gitHead | `String` | The sha of the last commit being part of the last release.                                                                          |
+| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the last release.                                  |
+| channel | `String` | The distribution channel on which the last release was initially made available (`undefined` for the default distribution channel). |

 **Notes**: If no previous release is found, `lastRelease` will be an empty `Object`.

@@ -137,6 +138,7 @@ Example:
  gitHead: 'da39a3ee5e6b4b0d3255bfef95601890afd80709',
  version: '1.0.0',
  gitTag: 'v1.0.0',
+  channel: 'next'
 }
 ```

@@ -206,13 +208,14 @@ Type: `Object`

 Information related to the newly published release:

-| Name    | Type     | Description                                                                                       |
-|---------|----------|---------------------------------------------------------------------------------------------------|
-| type    | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).               |
-| version | `String` | The version of the new release.                                                                   |
-| gitHead | `String` | The sha of the last commit being part of the new release.                                         |
-| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the new release. |
-| notes   | `String` | The release notes for the new release.                                                            |
+| Name    | Type     | Description                                                                                                                   |
+|---------|----------|-------------------------------------------------------------------------------------------------------------------------------|
+| type    | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).                                           |
+| version | `String` | The version of the new release.                                                                                               |
+| gitHead | `String` | The sha of the last commit being part of the new release.                                                                     |
+| gitTag  | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the new release.                             |
+| notes   | `String` | The release notes for the new release.                                                                                        |
+| channel | `String` | The distribution channel on which the next release will be made available (`undefined` for the default distribution channel). |

 Example:
 ```js
@@ -222,6 +225,7 @@ Example:
  version: '1.1.0',
  gitTag: 'v1.1.0',
  notes: 'Release notes for version 1.1.0...',
+  channel : 'next'
 }
 ```

@@ -229,19 +233,20 @@ Example:

 Type: `Array<Object>`

-The list of releases published, one release per [publish plugin](../usage/plugins.md#publish-plugin).<br>
+The list of releases published or made available to a distribution channel.<br>
 Each release object has the following properties:

-| Name       | Type     | Description                                                                                   |
-|------------|----------|-----------------------------------------------------------------------------------------------|
-| name       | `String` | **Optional.** The release name, only if set by the corresponding `publish` plugin.            |
-| url        | `String` | **Optional.** The release URL, only if set by the corresponding `publish` plugin.             |
-| type       | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).           |
-| version    | `String` | The version of the release.                                                                   |
-| gitHead    | `String` | The sha of the last commit being part of the release.                                         |
-| gitTag     | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the release. |
-| notes      | `String` | The release notes for the release.                                                            |
-| pluginName | `String` | The name of the plugin that published the release.                                            |
+| Name       | Type     | Description                                                                                                    |
+|------------|----------|----------------------------------------------------------------------------------------------------------------|
+| name       | `String` | **Optional.** The release name, only if set by the corresponding `publish` plugin.                             |
+| url        | `String` | **Optional.** The release URL, only if set by the corresponding `publish` plugin.                              |
+| type       | `String` | The [semver](https://semver.org) type of the release (`patch`, `minor` or `major`).                            |
+| version    | `String` | The version of the release.                                                                                    |
+| gitHead    | `String` | The sha of the last commit being part of the release.                                                          |
+| gitTag     | `String` | The [Git tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging) associated with the release.                  |
+| notes      | `String` | The release notes for the release.                                                                             |
+| pluginName | `String` | The name of the plugin that published the release.                                                             |
+| channel    | `String` | The distribution channel on which the release is available (`undefined` for the default distribution channel). |

 Example:
 ```js
@@ -255,6 +260,7 @@ Example:
    gitTag: 'v1.1.0',
    notes: 'Release notes for version 1.1.0...',
    pluginName: '@semantic-release/github'
+    channel: 'next'
  },
  {
    name: 'npm package (@latest dist-tag)',
@@ -265,6 +271,7 @@ Example:
    gitTag: 'v1.1.0',
    notes: 'Release notes for version 1.1.0...',
    pluginName: '@semantic-release/npm'
+    channel: 'next'
   }
 ]
 ```
@@ -35,7 +35,7 @@

 ## Community plugins

-[Open a Pull Request](https://github.com/semantic-release/semantic-release/blob/caribou/CONTRIBUTING.md#submitting-a-pull-request) to add your plugin to the list.
+[Open a Pull Request](https://github.com/semantic-release/semantic-release/blob/master/CONTRIBUTING.md#submitting-a-pull-request) to add your plugin to the list.

 - [semantic-release-docker](https://github.com/felixfbecker/semantic-release-docker)
  - `verifyConditions`: Verify that all needed configuration is present and login to the Docker registry.
@@ -59,3 +59,6 @@
  - `publish`: Submit the generated archives to the webstore for review, and publish the item including release notes
 - [semantic-release-gerrit](https://github.com/pascalMN/semantic-release-gerrit)
  - `generateNotes`: Generate release notes with Gerrit reviews URL
+- [semantic-release-expo](https://github.com/bycedric/semantic-release-expo)
+  - `verifyConditions`: Verify Expo manifest(s) are readable and valid.
+  - `prepare`: Update version, ios build number and android version code in the Expo manifest(s).
@@ -9,4 +9,9 @@
 ## Git hosted services
 - [Git authentication with SSH keys](git-auth-ssh-keys.md)

+## Release workflow
+- [Publishing on distribution channels](distribution-channels.md)
+- [Publishing maintenance releases](maintenance-releases.md)
+- [Publishing pre-releases](pre-releases.md)
+
 ## Package managers and languages
@@ -0,0 +1,116 @@
+# Publishing on distribution channels
+
+This recipe will walk you through a simple example that uses distribution channels to make releases available only to a subset of users, in order to collect feedbacks before distributing the release to all users.
+
+This example uses the **semantic-release** default configuration:
+- [branches](../usage/configuration.md#branches): `['+([1-9])?(.{+([1-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`
+- [plugins](../usage/configuration.md#plugins): `['@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', '@semantic-release/npm', '@semantic-release/github']`
+
+## Initial release
+
+We'll start by making the first commit of the project, with the code for the initial release and the message `feat: initial commit` to `master`. When pushing that commit, **semantic-release** will release the version `1.0.0` and make it available on the default distribution channel which is the dist-tag `@latest` for npm.
+
+The Git history of the repository is:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+```
+
+## Releasing a bug fix
+
+We can now continue to commit changes and release updates to our users. For example we can commit a bug fix with the message `fix: a fix` to `master`. When pushing that commit, **semantic-release** will release the version `1.0.1` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+```
+
+## Releasing a feature on next
+
+We now want to develop an important feature, which is a breaking change. Considering the scope of this feature we want to make it available, at first, only to our most dedicated users in order to get feedback. Once we get that feedback we can make improvements and ultimately make the new feature available to all users.
+
+To implement that workflow we can create the branch `next` and commit our feature to this branch. When pushing that commit, **semantic-release** will release the version `2.0.0` on the dist-tag `@next`. That means only the users installing our module with `npm install example-module@next` will receive the version `2.0.0`. Other users installing with `npm install example-module` will still receive the version `1.0.1`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+```
+
+## Releasing a bug fix on next
+
+One of our users starts to use the new `2.0.0` release and reports a bug. We develop a bug fix and commit it to the `next` branch with the message `fix: fix something on the big feature`. When pushing that commit, **semantic-release** will release the version `2.0.1` on the dist-tag `@next`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+```
+
+## Releasing a feature on latest
+
+We now want to develop a smaller, non-breaking feature. Its scope is small enough that we don't need to have a phase of feedback and we can release it to all users right away.
+
+If we were to commit that feature on `next` only a subset of users would get it, and we would need to wait for the end of our feedback period in order to make both the big and the small feature available to all users.
+
+Instead, we develop that small feature commit it to `master` with the message `feat: a small feature`. When pushing that commit, **semantic-release** will release the version `1.1.0` on the dist-tag `@latest` so all users can benefit from it right away.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+*  | feat: a small feature # => v1.1.0 on @latest
+```
+
+## Porting a feature to next
+
+Most of our users now have access to the small feature, but we still need to make it available to our users using the `@next` dist-tag. To do so we need to merge our changes made on `master` (the commit `feat: a small feature`) into `next`. As `master` and `next` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `next`, **semantic-release** will release the version `2.1.0` on the dist-tag `@next` which contains both our small and big feature.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+*  | feat: a small feature # => v1.1.0 on @latest
+|  * Merge branch master into next # => v2.1.0 on @next
+```
+
+## Adding a version to latest
+
+After a period of feedback from our users using the `@next` dist-tag we feel confident to make our big feature available to all users. To do so we merge the `next` branch into `master`. There should be no conflict as `next` is strictly ahead of `master`.
+
+Once the merge commit is pushed to `next`, **semantic-release** will add the version `2.1.0` to the dist-tag `@latest` so all users will receive it when installing out module with `npm install example-module`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* fix: a fix # => v1.0.1 on @latest
+| \
+|  * feat: a big feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0 on @next
+|  * fix: fix something on the big feature # => v2.0.1 on @next
+*  | feat: a small feature # => v1.1.0 on @latest
+|  * Merge branch master into next # => v2.1.0 on @next
+| /|
+*  | Merge branch next into master # => v2.1.0 on @latest
+```
+
+We can now continue to push new fixes and features on `master`, or a new breaking change on `next` as we did before.
@@ -0,0 +1,156 @@
+# Publishing maintenance releases
+
+This recipe will walk you through a simple example that uses Git branches and distribution channels to publish fixes and features for old versions of a package.
+
+This example uses the **semantic-release** default configuration:
+- [branches](../usage/configuration.md#branches): `['+([1-9])?(.{+([1-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`
+- [plugins](../usage/configuration.md#plugins): `['@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', '@semantic-release/npm', '@semantic-release/github']`
+
+## Initial release
+
+We'll start by making the first commit of the project, with the code for the initial release and the message `feat: initial commit`. When pushing that commit, on `master` **semantic-release** will release the version `1.0.0` and make it available on the default distribution channel which is the dist-tag `@latest` for npm.
+
+The Git history of the repository is:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+```
+
+## Releasing a breaking change
+
+We now decide to drop Node.js 6 support for our package, and require Node.js 8 or higher, which is a breaking change.  
+
+We commit that change with the message `feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required` to `master`. When pushing that commit, **semantic-release** will release the version `2.0.0` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+* feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+```
+
+## Releasing a feature for version 1.x users
+
+One of our users request a new feature, however they cannot migrate to Node.js 8 or higher due to corporate policies.
+
+If we were to push that feature on `master` and release it, the new version would require Node.js 8 or higher as the release would also contains the commit `feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required`.
+
+Instead, we create the branch `1.x` from the tag `v1.0.0` with the command `git checkout -b 1.x v1.0.0` and we commit that feature with the message `feat: a feature` to the branch `1.x`. When pushing that commit, **semantic-release** will release the version `1.1.0` on the dist-tag `@release-1.x` so users who can't migrate to Node.js 8 or higher can benefit from it.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  * feat: a feature # => v1.1.0 on @1.x
+```
+
+## Releasing a bug fix for version 1.0.x users
+
+Another user currently using version `1.0.0` reports a bug. They cannot migrate to Node.js 8 or higher and they also cannot migrate to `1.1.0` as they do not use the feature developed in `feat: a feature` and their corporate policies require to go through a costly quality insurance process for each `minor` upgrades.
+
+In order to deliver the bug fix in a `patch` release, we create the branch `1.0.x` from the tag `v1.0.0` with the command `git checkout -b 1.0.x v1.0.0` and we commit that fix with the message `fix: a fix` to the branch `1.0.x`. When pushing that commit, **semantic-release** will release the version `1.0.1` on the dist-tag `@release-1.0.x` so users who can't migrate to `1.1.x` or `2.x` can benefit from it.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+```
+
+## Porting a bug fix from 1.0.x to 1.x
+
+Now that we have released a fix in version `1.0.1` we want to make it available to `1.1.x` users as well.
+
+To do so we need to merge the changes made on `1.0.x` (the commit `fix: a fix`) into the `1.x` branch. As `1.0.x` and `1.x` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to the branch `1.x`, **semantic-release** will release the version `1.1.1` on the dist-tag `@release-1.x` which contains both our feature and bug fix.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+```
+
+## Porting bug fixes and features to master
+
+Finally we want to make both our feature and bug fix available to users using the `@latest` dist-tag.
+
+To do so we need to merge the changes made on `1.x` (the commits `feat: a feature` and `fix: a fix`) into `master`. As `1.x` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `master`, **semantic-release** will release the version `2.1.0` on the dist-tag `@latest` which now contains the breaking change feature, the feature and the bug fix.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+| /|  |
+*  |  | Merge branch 1.x into master # => v2.1.0 on @latest
+```
+
+## Releasing a bug fix for version 2.1.0 users
+
+One of our users using the version `2.1.0` version reports a bug.
+
+We can simply commit the bug fix with the message `fix: another fix` to `master`. When pushing that commit, **semantic-release** will release the version `2.1.1` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+| /|  |
+*  |  | Merge branch 1.x into master # => v2.1.0 on @latest
+*  |  | fix: another fix # => v2.1.1 on @latest
+```
+
+## Porting a bug fix from master to 1.x
+
+The bug fix `fix: another fix` also affects version `1.1.1` users, so we want to port it to the `1.x` branch.
+
+To do so we need to cherry pick our fix commit made on `master` (`fix: another fix`) into `1.x` with `git checkout 1.x && git cherry-pick <sha of fix: another fix>`. As `master` and `1.x` branches have diverged, the cherry picking might require to resolve conflicts.
+
+Once the conflicts are resolved and the commit is pushed to `1.x`, **semantic-release** will release the version `1.1.2` on the dist-tag `@release-1.x` which contains `feat: a feature`, `fix: a fix` and `fix: another fix` but not `feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+*  | feat: drop Node.js 6 support \n\n BREAKING CHANGE: Node.js >= 8 required # => v2.0.0 on @latest
+|  | \
+|  *  | feat: a feature # => v1.1.0 on @1.x
+|  |  * fix: a fix # => v1.0.1 on @1.0.x
+|  | /|
+|  *  | Merge branch 1.0.x into 1.x # => v1.1.1 on @1.x
+| /|  |
+*  |  | Merge branch 1.x into master # => v2.1.0 on @latest
+*  |  | fix: another fix # => v2.1.1 on @latest
+|  |  |
+|  *  | fix: another fix # => v1.1.2 on @1.x
+```
@@ -0,0 +1,196 @@
+# Publishing pre-releases
+
+This recipe will walk you through a simple example that uses pre-releases to publish beta versions while working on a future major release and then make only one release on the default distribution.
+
+This example uses the **semantic-release** default configuration:
+- [branches](../usage/configuration.md#branches): `['+([1-9])?(.{+([1-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`
+- [plugins](../usage/configuration.md#plugins): `['@semantic-release/commit-analyzer', '@semantic-release/release-notes-generator', '@semantic-release/npm', '@semantic-release/github']`
+
+## Initial release
+
+We'll start by making the first commit of the project, with the code for the initial release and the message `feat: initial commit`. When pushing that commit, on `master` **semantic-release** will release the version `1.0.0` and make it available on the default distribution channel which is the dist-tag `@latest` for npm.
+
+The Git history of the repository is:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+```
+
+## Working on a future release
+
+We now decide to work on a future major release, which will be composed of multiple features, some of them being breaking changes. We want to publish our package for each new feature developed for test purpose, however we do not want to increment our package version or make it available to our users until all the features are developed and tested.
+
+To implement that workflow we can create the branch `beta` and commit our first feature there. When pushing that commit, **semantic-release** will publish the pre-release version `2.0.0-beta.1` on the dist-tag `@beta`. That allow us to run integration tests by installing our module with `npm install example-module@beta`. Other users installing with `npm install example-module` will still receive the version `1.0.0`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+```
+
+We can continue to work on our future release by committing and pushing other features or bug fixes on the `beta` branch. With each push, **semantic-release** will publish a new pre-release on the dist-tag `@beta`, which allow us to run our integration tests.
+
+With another feature, the Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+```
+
+## Releasing a bug fix on the default distribution channel
+
+In the meantime we can also continue to commit changes and release updates to our users.
+
+For example, we can commit a bug fix with the message `fix: a fix` to `master`. When pushing that commit, **semantic-release** will release the version `1.0.1` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+```
+
+## Working on another future release
+
+We now decide to work on another future major release, in parallel of the beta one, which will also be composed of multiple features, some of them being breaking changes.
+
+To implement that workflow we can create the branch `alpha` from the branch `beta` and commit our first feature there. When pushing that commit, **semantic-release** will publish the pre-release version `3.0.0-alpha.1` on the dist-tag `@alpha`. That allow us to run integration tests by installing our module with `npm install example-module@alpha`. Other users installing with `npm install example-module` will still receive the version `1.0.0`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+```
+
+We can continue to work on our future release by committing and pushing other features or bug fixes on the `alpha` branch. With each push, **semantic-release** will publish a new pre-release on the dist-tag `@alpha`, which allow us to run our integration tests.
+
+With another feature, the Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+```
+
+## Publishing the 2.0.0 beta release to the default distribution channel
+
+Once we've developed and pushed all the feature we want to include in the future version `2.0.0` in the `beta` branch and all our tests are successful we can release it to our users.
+
+To do so we need to merge our changes made on `beta` into `master`. As `beta` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `master`, **semantic-release** will release the version `2.0.0` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+```
+
+## Publishing the 3.0.0 alpha release to the beta distribution channel
+
+Now that we published our the version `2.0.0` that was previously in beta, we decide to promote the version `3.0.0` in alpha to beta.
+
+To do so we need to merge our changes made on `alpha` into `beta`. There should be no conflict as `alpha` is strictly ahead of `master`.
+
+Once the merge commit is pushed to `beta`, **semantic-release** will publish the pre-release version `3.0.0-beta.1` on the dist-tag `@beta`, which allow us to run our integration tests.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+|  | /|
+|  *  | Merge branch alpha into beta # => v3.0.0-beta.1 on @beta
+```
+
+## Publishing the 3.0.0 beta release to the default distribution channel
+
+Once we've developed and pushed all the feature we want to include in the future version `3.0.0` in the `beta` branch and all our tests are successful we can release it to our users.
+
+To do so we need to merge our changes made on `beta` into `master`. As `beta` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+Once the conflicts are resolved and the merge commit is pushed to `master`, **semantic-release** will release the version `3.0.0` on the dist-tag `@latest`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+|  | /|
+|  *  | Merge branch alpha into beta # => v3.0.0-beta.1 on @beta
+| /|  |
+*  |  | Merge branch beta into master # => v3.0.0 on @latest
+```
+
+## Working on a third future release
+
+We can now start to work on a new future major release, version `4.0.0`, on the `@beta` distribution channel.
+
+To do so we fist need to update the `beta` branch with all the changes from `master` (the commits `fix: a fix`). As `beta` and `master` branches have diverged, this merge might require to resolve conflicts.
+
+We can now commit our new feature on `beta`. When pushing that commit, **semantic-release** will publish the pre-release version `3.1.0-beta.1` on the dist-tag `@beta`. That allow us to run integration tests by installing our module with `npm install example-module@beta`. Other users installing with `npm install example-module` will still receive the version `3.0.0`.
+
+The Git history of the repository is now:
+
+```
+* feat: initial commit # => v1.0.0 on @latest
+| \
+|  * feat: first feature \n\n BREAKING CHANGE: it breaks something # => v2.0.0-beta.1 on @beta
+|  * feat: second feature # => v2.0.0-beta.2 on @beta
+*  | fix: a fix # => v1.0.1 on @latest
+|  | \
+|  |  * feat: first feature of other release \n\n BREAKING CHANGE: it breaks something # => v3.0.0-alpha.1 on @alpha
+|  |  * feat: second feature of other release # => v3.0.0-alpha.2 on @alpha
+| /|  |
+*  |  | Merge branch beta into master # => v2.0.0 on @latest
+|  | /|
+|  *  | Merge branch alpha into beta # => v3.0.0-beta.1 on @beta
+| /|  |
+*  |  | Merge branch beta into master # => v3.0.0 on @latest
+| \|  |
+|  *  | Merge branch master into beta
+|  *  | feat: new feature # => v3.1.0-beta.1 on @beta
+```
@@ -12,7 +12,25 @@ However, the [`@semantic-release/git`](https://github.com/semantic-release/git)

 The `package.json`’s version will be updated by the `semantic-release` command just before publishing to [npm](https://www.npmjs.com), therefore it won't be available for scripts ran before the `semantic-release` command.

-As semantic-release uses the [npm CLI](https://docs.npmjs.com/cli/npm) to publish, all [npm hook scripts](https://docs.npmjs.com/misc/scripts#hook-scripts) will be executed. Therefore you can run your build script in the [`prepublishOnly`](https://docs.npmjs.com/misc/scripts#prepublish-and-prepare) hook. It will be executed after the `semantic-release` command update the `package.json`’s version and before publishing.
+As the [`@semantic-release/npm`](https://github.com/semantic-release/npm) plugin uses the [npm CLI](https://docs.npmjs.com/cli/npm) to update the `package.json` version and publish the package, all [npm hook scripts](https://docs.npmjs.com/misc/scripts#description) will be executed.
+
+You can run your build script in:
+- the `prepublishOnly` or `prepack` hook so it will be executed during the `publish` step of `@semantic-release/npm`
+- the `postversion` hook so it will be executed during the `prepare` step of `@semantic-release/npm`, which allow for example to update files before committing them with the [`@semantic-release/git`](https://github.com/semantic-release/git) plugin
+
+If using npm hook scripts is not possible, and alternative solution is to [`@semantic-release/exec`](https://github.com/semantic-release/exec) plugin to run your script in the `prepare` step:
+```json
+{
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/npm",
+    ["@semantic-release/exec", {
+      "prepareCmd": "./my-build-script.sh ${nextRelease.version}",
+    }],
+  ]
+}
+```

 ## Is there a way to preview which version would currently get published?

@@ -59,28 +77,23 @@ To publish a non-Node package (without a `package.json`) you would need to:

 See the [CI configuration recipes](../recipes/README.md#ci-configurations) for more details on specific CI environments.

-In addition you will need to configure the **semantic-release** [plugins](../usage/plugins.md#plugins) to:
- Disable the [`@semantic-release/npm`](https://github.com/semantic-release/npm) plugin
- Define plugins for the [verifyConditions](../usage/plugins.md#verifyconditions-plugin), [prepare](../usage/plugins.md#prepare-plugin) and [publish](../usage/plugins.md#publish-plugin) steps to release on your package registry. The [`@semantic-release/exec`](https://github.com/semantic-release/exec) plugin is recommended for situation where a release can be done with a shell command.
+In addition you will need to configure the **semantic-release** [plugins](../usage/plugins.md#plugins) to disable the [`@semantic-release/npm`](https://github.com/semantic-release/npm) plugin which is used by default and use a plugin for your project type.

-Here is a basic example to create [GitHub releases](https://help.github.com/articles/about-releases) and use shell command to publish:
+If there is no specific plugin for your project type you can use the [`@semantic-release/exec`](https://github.com/semantic-release/exec) plugin to publish the release with a shell command.
+
+Here is a basic example to create [GitHub releases](https://help.github.com/articles/about-releases) and use a shell command to publish:

 ```json
 {
-  "verifyConditions": ["@semantic-release/github"],
-  "prepare": [
-    {
-      "path": "@semantic-release/exec",
-      "cmd": "set-version ${nextRelease.version}"
-    }
-  ],
-  "publish": [
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
    "@semantic-release/github",
-    {
-      "path": "@semantic-release/exec",
-      "cmd": "publish-package"
-    }
-  ],
+    ["@semantic-release/exec", {
+      "prepareCmd" : "set-version ${nextRelease.version}",
+      "publishCmd" : "publish-package"
+      }]
+  ]
 }
 ```

@@ -114,7 +127,7 @@ See the [GitLab CI recipes](../recipes/gitlab-ci.md#using-semantic-release-with-

 ## Can I use semantic-release with any Git hosted environment?

-By default **semantic-release** uses the [`@semantic-release/github`](https://github.com/semantic-release/github) plugin to publish a [GitHub release](https://help.github.com/articles/about-releases). For other Git hosted environment the  [`@semantic-release/git`](https://github.com/semantic-release/git) and [`@semantic-release/changelog`](https://github.com/semantic-release/changelog) plugins can be used via [plugins configuration](../usage/plugins.md#configuration).
+By default **semantic-release** uses the [`@semantic-release/github`](https://github.com/semantic-release/github) plugin to publish a [GitHub release](https://help.github.com/articles/about-releases). For other Git hosted environment the  [`@semantic-release/git`](https://github.com/semantic-release/git) and [`@semantic-release/changelog`](https://github.com/semantic-release/changelog) plugins can be used via [plugins configuration](../usage/plugins.md).

 See the [`@semantic-release/git`](https://github.com/semantic-release/git#semantic-releasegit) [`@semantic-release/changelog`](https://github.com/semantic-release/changelog#semantic-releasechangelog) plugins documentation for more details.

@@ -4,17 +4,17 @@

 - ["Introducing Reliable Dependency and Release Management for npm Packages" - Gregor Martynus](https://www.youtube.com/watch?v=R2RJWLcfzwc)
 - ["Kill all humans" - Jan Lehnardt](https://www.youtube.com/watch?v=ZXyx_1kN1L8&t=2s)
- [Publishing JavaScript Packages" - JavaScript Air](https://javascriptair.com/episodes/2016-07-20)
+- ["Publishing JavaScript Packages" - JavaScript Air](https://javascriptair.com/episodes/2016-07-20)
 - ["Managing Dependencies like a boss 😎" - JavaScript Air](https://javascriptair.com/episodes/2016-08-17)
 - ["Dependency Hell Just Froze Over" - Stephan Bönnemann](https://www.youtube.com/watch?v=PA139CERNbc)
- [“semantic-release Q&A with Kent C. Dodds”](https://www.youtube.com/watch?v=g6y3DnhkjrI)
- [“We fail to follow SemVer – and why it needn’t matter” - Stephan Bönnemann](https://www.youtube.com/watch?v=tc2UgG5L7WM)
+- ["semantic-release Q&A with Kent C. Dodds"](https://www.youtube.com/watch?v=g6y3DnhkjrI)
+- ["We fail to follow SemVer – and why it needn’t matter" - Stephan Bönnemann](https://www.youtube.com/watch?v=tc2UgG5L7WM)

 ## Articles

- [“Introduction to SemVer” - Irina Gebauer](https://blog.greenkeeper.io/introduction-to-semver-d272990c44f2)
+- ["Introduction to SemVer" - Irina Gebauer](https://blog.greenkeeper.io/introduction-to-semver-d272990c44f2)
 - ["Introduction to Semantic Release" - liv](https://blog.greenkeeper.io/introduction-to-semantic-release-33f73b117c8)

 ## Tutorials

- [“How to Write a JavaScript Library - Automating Releases with semantic-release” – egghead.io](https://egghead.io/lessons/javascript-automating-releases-with-semantic-release)
+- ["How to Write a JavaScript Library - Automating Releases with semantic-release" – egghead.io](https://egghead.io/lessons/javascript-automating-releases-with-semantic-release)
@@ -1,49 +1,26 @@
 # Troubleshooting

-## ENOTINHISTORY Commit not in history
-
-This error happens when the commit associated with the last release cannot be found in the branch history.
-
-Multiple situation can cause this issue:
- The package name configured in your `package.json` already exists and **semantic-release** obtains the last release of that package, which is unrelated to yours
- The commit history has been rewritten since the last release (with `git rebase` and `git push -f`)
-
-If the package name configured in your `package.json` already exits, you should change it, and commit the `package.json`. Then **semantic-release** will proceed normally and make the initial release.
-
-If you can identify the commit in your branch history that should be associated with the release version mentioned in the error message you can recover by tagging this commit:
-
-```bash
-$ git tag -f v<version of the last release> <commit sha1 corresponding to last release>
-$ git push -f --tags origin <your release branch>
-```
-
-## ENOGITHEAD There is no commit associated with last release
-
-This error happens when there is no commit associated with the last release that can be found in the package metadata on the npm registry.
-
-This usually happen when the last release has been made without access to the git repository informations.
-
-You can recover from that issue by identifying the commit in your branch history that should have been associated with the release version mentioned in the error message and tagging this commit:
-
-```bash
-$ git tag -f v<version of the last release> <commit sha1 corresponding to last release>
-$ git push -f --tags origin <your release branch>
-```
-
 ## You do not have permission to publish 'package-name'

-When running semantic-release you may encounter the following error:
+When running semantic-release you might encounter the following error:

-```
-An error occurred while running semantic-release: { Error: Command failed: npm publish ./. --registry https://registry.npmjs.org/
+```bash
 npm ERR! publish Failed PUT 403
 npm ERR! code E403
 npm ERR! You do not have permission to publish "<package-name>". Are you logged in as the correct user? : <package-name>
 ```

-This message is a little unclear, and might not have anything to with your `NPM_TOKEN` or authentication method. It might instead be related to the package name itself. If there is already a package with the same name as yours or, there is a very close match, it could trigger this error.
+This is most likely related to a misconfiguration of the [npm registry authentication](https://github.com/semantic-release/npm#npm-registry-authentication) or to your user [missing permission](https://docs.npmjs.com/cli/team) for publishing.

-Best way to be sure, is to search [npmjs.org](https://www.npmjs.com/)) using your package name. If there is a name conflict, rename your package in your `package.json`
+It might also happen if the package name you are trying to publish already exists (in such case npm consider you are trying to publish a new version of a package that is not yours, hence the permission error).
+
+To verify if your package name is available you can use [npm-name-cli](https://github.com/sindresorhus/npm-name-cli):
+```bash
+$ npm install --global npm-name-cli
+$ npm-name <package-name>
+```
+
+If the package name is not available, change it in your `package.json` or consider using an [npm scope](https://docs.npmjs.com/misc/scope).

 ## Squashed commits are ignored by **semantic-release**

@@ -54,3 +31,26 @@ When [squashing commits](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-Hist
 When squashing commits make sure to rewrite the resulting commit message to be compliant with the project's commit message convention.

 **Note**: if the resulting squashed commit would encompasses multiple changes (for example multiple unrelated features or fixes) then it's probably not a good idea to squash those commits together. A commit should contain exactly one self-contained functional change and a functional change should be contained in exactly one commit. See [atomic commits](https://en.wikipedia.org/wiki/Atomic_commit).
+
+## `reference already exists` error when pushing tag
+
+**semantic-release** read [Git tags](https://git-scm.com/book/en/v2/Git-Basics-Tagging) that are present in the history of your release branch in order to determine the last release published. Then it determines the next version to release based on the commits pushed since then and create the corresponding tag.
+If a tag with the name already in your repository, Git will throw and error as tags must be unique across the repository.
+This situation happens when you have a version tag identical to the new one **semantic-release** is trying to create that is not in the history of the current branch.
+
+If an actual release with that version number was published you need to merge all the commits up to that release into your release branch.
+
+If there is no published release with that version number, the tag must be deleted.
+
+```bash
+# Verify if the commit exists in the repository
+$ git rev-list -1 <tag name>
+# If a commit sha is returned, then the tag exists
+
+# Verify the branches having the tagged commit in their history
+$ git branch --contains <tag name>
+
+# Delete the tag
+$ git tag -d <tag name>
+$ git push origin :refs/tags/<tag name>
+```
@@ -2,7 +2,7 @@

 ## Run `semantic-release` only after all tests succeeded

-The `semantic-release` command must be executed only after all the tests in the CI build pass. If the build runs multiple jobs (for example to test on multiple Operating Systems or Node versions) the CI has to be configured to guarantee that the `semantic-release` command is executed only after all jobs are successful. This can be achieved with [Travis Build Stages](https://docs.travis-ci.com/user/build-stages), [CircleCI Workflows](https://circleci.com/docs/2.0/workflows), [Codeship Deployment Pipelines](https://documentation.codeship.com/basic/builds-and-configuration/deployment-pipelines), [GitLab Pipelines](https://docs.gitlab.com/ee/ci/pipelines.html#introduction-to-pipelines-and-jobs), [Wercker Workflows](http://devcenter.wercker.com/docs/workflows), [GoCD Pipelines](https://docs.gocd.org/current/introduction/concepts_in_go.html#pipeline) or specific tools like [`travis-deploy-once`](https://github.com/semantic-release/travis-deploy-once).
+The `semantic-release` command must be executed only after all the tests in the CI build pass. If the build runs multiple jobs (for example to test on multiple Operating Systems or Node versions) the CI has to be configured to guarantee that the `semantic-release` command is executed only after all jobs are successful. This can be achieved with [Travis Build Stages](https://docs.travis-ci.com/user/build-stages), [CircleCI Workflows](https://circleci.com/docs/2.0/workflows), [Codeship Deployment Pipelines](https://documentation.codeship.com/basic/builds-and-configuration/deployment-pipelines), [GitLab Pipelines](https://docs.gitlab.com/ee/ci/pipelines.html#introduction-to-pipelines-and-jobs), [Codefresh Pipelines](https://codefresh.io/docs/docs/configure-ci-cd-pipeline/introduction-to-codefresh-pipelines), [Wercker Workflows](http://devcenter.wercker.com/docs/workflows), [GoCD Pipelines](https://docs.gocd.org/current/introduction/concepts_in_go.html#pipeline) or specific tools like [`travis-deploy-once`](https://github.com/semantic-release/travis-deploy-once).

 See [CI configuration recipes](../recipes/README.md#ci-configurations) for more details.

@@ -1,11 +1,11 @@
 # Configuration

-**semantic-release** configuration consist of:
- Git repository options ([URL](#repositoryurl), [release branch](#branch) and [tag format](#tagformat))
+**semantic-release** configuration consists of:
+- Git repository options ([URL](#repositoryurl), [release branches](#branches) and [tag format](#tagformat))
 - [plugins](#plugins) definition
 - run mode ([debug](#debug), [dry run](#dryrun) and [local (no CI)](#ci))

-All those options can be configured directly or by extending a [shareable configuration](shareable-configurations.md).
+All of these options can be configured directly or by extending a [shareable configuration](shareable-configurations.md).

 Additionally, metadata of Git tags generated by **semantic-release** can be customized via standard [Git environment variables](#git-environment-variables).

@@ -16,7 +16,7 @@ Additionally, metadata of Git tags generated by **semantic-release** can be cust
 - A `release.config.js` file that exports an object
 - A `release` key in the project's `package.json` file

-Alternatively some options can be set via CLI arguments.
+Alternatively, some options can be set via CLI arguments.

 The following three examples are the same.

@@ -25,7 +25,7 @@ Via `release` key in the project's `package.json` file:
 ```json
 {
  "release": {
-    "branch": "next"
+    "branches": ["master", "next"]
  }
 }
 ```
@@ -37,7 +37,7 @@ Via `.releaserc` file:

 ```json
 {
-  "branch": "next"
+  "branches": ["master", "next"]
 }
 ```
 ```bash
@@ -67,13 +67,23 @@ List of modules or file paths containing a [shareable configuration](shareable-c

 **Note**: Options defined via CLI arguments or in the configuration file will take precedence over the ones defined in any shareable configuration.

-### branch
+### branches

-Type: `String`<br>
-Default: `master`<br>
-CLI arguments: `-b`, `--branch`
+Type: `Array`, `String`, `Object`<br>
+Default: `['+([1-9])?(.{+([1-9]),x}).x', 'master', 'next', 'next-major', {name: 'beta', prerelease: true}, {name: 'alpha', prerelease: true}]`<br>
+CLI arguments: `--branches`

-The branch on which releases should happen.
+The branches on which releases should happen. By default **semantic-release** will release:
+- regular releases to the default distribution channel from the branch `master`
+- regular releases to a distribution channel matching the branch name from any existing branch with a name matching a maintenance release range (`N.N.x` or `N.x.x` or `N.x` with `N` being a number)
+- regular releases to the `next` distribution channel from the branch `next` if it exists
+- regular releases  to the `next-major` distribution channel from the branch `next-major` if it exists
+- prereleases to the `beta` distribution channel from the branch `beta` if it exists
+- prereleases to the `alpha` distribution channel from the branch `alpha` if it exists
+
+**Note**: Once **semantic-release** is configured, any user with the permission to push commits on one of those branches will be able to publish a release. It is recommended to protect those branches, for example with [GitHub protected branches](https://help.github.com/articles/about-protected-branches).
+
+See [Plugins configuration](plugins.md#plugins) for more details.

 ### repositoryUrl

@@ -105,7 +115,7 @@ Define the list of plugins to use. Plugins will run in series, in the order defi

 Plugins configuration can defined by wrapping the name and an options object in an array.

-See [Plugins configuration](plugins.md#configuration) for more details.
+See [Plugins configuration](plugins.md#plugins) for more details.

 ### dryRun

@@ -131,7 +141,7 @@ Type: `Boolean`<br>
 Default: `false`<br>
 CLI argument: `--debug`

-Output debugging information. It can also be enabled by setting the `DEBUG` environment variable to `semantic-release:*`.
+Output debugging information. This can also be enabled by setting the `DEBUG` environment variable to `semantic-release:*`.

 ## Git environment variables

@@ -141,3 +151,28 @@ Output debugging information. It can also be enabled by setting the `DEBUG` envi
 | `GIT_AUTHOR_EMAIL`    | The author email associated with the [Git release tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging). See [Git environment variables](https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables#_committing).    | @semantic-release-bot email address. |
 | `GIT_COMMITTER_NAME`  | The committer name associated with the [Git release tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging). See [Git environment variables](https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables#_committing).  | @semantic-release-bot.               |
 | `GIT_COMMITTER_EMAIL` | The committer email associated with the [Git release tag](https://git-scm.com/book/en/v2/Git-Basics-Tagging). See [Git environment variables](https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables#_committing). | @semantic-release-bot email address. |
+
+## Existing version tags
+
+**semantic-release** uses [Git tags](https://git-scm.com/book/en/v2/Git-Basics-Tagging) to determine the commits added since the last release. If a release has been published before setting up **semantic-release** you must make sure the most recent commit included in the last published release is in the [release branches](#branches) history and is tagged with the version released, formatted according to the [tag format](#tagformat) configured (defaults to `vx.y.z`).
+
+If the previous releases were published with [`npm publish`](https://docs.npmjs.com/cli/publish) this should already be the case.
+
+For example, if your release branch is `master`, the last release published on your project is `1.1.0` and the last commit included has the sha `1234567`, you must make sure this commit is in `master` history and is tagged with `v1.1.0`.
+
+```bash
+# Make sure the commit 1234567 is in the release branch history
+$ git branch --contains 1234567
+
+# If the commit is not in the branch history it means that either:
+# - you use a different branch than the one your release from before
+# - or the commit sha has been rewritten (with git rebase)
+# In both cases you need to configure your repository to have the last release commit in the history of the release branch
+
+# List the tags for the commit 1234567
+$ git tag --contains 1234567
+
+# If v1.1.0 is not in the list you add it with
+$ git tag v1.1.0 1234567
+$ git push origin v1.1.0
+```
@@ -4,16 +4,18 @@ Each [release step](../../README.md#release-steps) is implemented by configurabl

 A plugin is a npm module that can implement one or more of the following steps:

-| Step               | Accept multiple | Required | Description                                                                                                                                                                                   |
-|--------------------|-----------------|----------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `verifyConditions` | Yes             | No       | Responsible for verifying conditions necessary to proceed with the release: configuration is correct, authentication token are valid, etc...                                                  |
-| `analyzeCommits`   | No              | Yes      | Responsible for determining the type of the next release (`major`, `minor` or `patch`).                                                                                                       |
-| `verifyRelease`    | Yes             | No       | Responsible for verifying the parameters (version, type, dist-tag etc...) of the release that is about to be published.                                                                       |
-| `generateNotes`    | Yes             | No       | Responsible for generating the content of the release note. If multiple `generateNotes` plugins are defined, the release notes will be the result of the concatenation of each plugin output. |
-| `prepare`          | Yes             | No       | Responsible for preparing the release, for example creating or updating files such as `package.json`, `CHANGELOG.md`, documentation or compiled assets and pushing a commit.                  |
-| `publish`          | Yes             | No       | Responsible for publishing the release.                                                                                                                                                       |
-| `success`          | Yes             | No       | Responsible for notifying of a new release.                                                                                                                                                   |
-| `fail`             | Yes             | No       | Responsible for notifying of a failed release.                                                                                                                                                |
+| Step               | Required | Description                                                                                                                                                                                                          |
+|--------------------|----------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `verifyConditions` | No       | Responsible for verifying conditions necessary to proceed with the release: configuration is correct, authentication token are valid, etc...                                                                         |
+| `analyzeCommits`   | Yes      | Responsible for determining the type of the next release (`major`, `minor` or `patch`). If multiple plugins with a `analyzeCommits` step are defined, the release type will be the highest one among plugins output. |
+| `verifyRelease`    | No       | Responsible for verifying the parameters (version, type, dist-tag etc...) of the release that is about to be published.                                                                                              |
+| `generateNotes`    | No       | Responsible for generating the content of the release note. If multiple plugins with a `generateNotes` step are defined, the release notes will be the result of the concatenation of each plugin output.            |
+| `prepare`          | No       | Responsible for preparing the release, for example creating or updating files such as `package.json`, `CHANGELOG.md`, documentation or compiled assets and pushing a commit.                                         |
+| `publish`          | No       | Responsible for publishing the release.                                                                                                                                                                              |
+| `success`          | No       | Responsible for notifying of a new release.                                                                                                                                                                          |
+| `fail`             | No       | Responsible for notifying of a failed release.                                                                                                                                                                       |
+
+**Note:** If no plugin with a `analyzeCommits` step is defined `@semantic-release/commit-analyzer` will be used.

 See [available plugins](../extending/plugins-list.md).

@@ -0,0 +1,187 @@
+# Workflow configuration
+
+**semantic-release** allow to manage and automate complex release workflow, based on multiple Git branches and distribution channels. This allow to:
+- Distributes certain releases to a particular group of users via distribution channels
+- Manage the availability of releases on distribution channels via branches merge
+- Maintain multiple lines of releases in parrallel
+- Work on large future releases outside the normal flow of one version increment per Git push
+
+See [Release workflow recipes](../recipes/README.md#release-workflow) for detailed examples.
+
+The release workflow is configured via the [branches option](./configuration.md#branches) which accepts a single or an array of branch definitions.
+Each branch can be defined either as a string, a [glob](https://github.com/micromatch/micromatch#matching-features) or an object. For string and glob definitions each [property](#branches-properties) will be defaulted.
+
+A branch can defined as one of three types:
+- [release](#release-branches): to make releases on top of the last version released
+- [maintenance](#maintenance-branches): to make release on top of an old release
+- [pre-release](#pre-release-branches): to make pre-releases
+
+The type of the branch is automatically determined based on naming convention and/or [properties](#branches-properties).
+
+## Branches properties
+
+| Property     | Branch type                               | Description                                                                                                                                                                           | Default                                                                                         |
+|--------------|-------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------|
+| `name`       | All                                       | **Required.** The Git branch holding the commits to analyze and the code to release. See [name](#name).                                                                               | - The value itself if defined as a `String` or the matching branches name if defined as a glob. |
+| `channel`    | All                                       | The distribution channel on which to publish releases from this branch. See [channel](#channel).                                                                                      | `undefined` for the first release branch, the value of `name` for subsequent ones.              |
+| `range`      | [maintenance](#maintenance-branches) only | **Required unless `name` is formatted like `N.N.x` or `N.x` (`N` is a number).** The range of [semantic versions](https://semver.org) to support on this branch. See [range](#range). | The value of `name`.                                                                            |
+| `prerelease` | [pre-release](#pre-release-branches) only | **Required.** The pre-release detonation to append to [semantic versions](https://semver.org) released from this branch. See [prerelease](#prerelease).                               | -                                                                                               |
+
+### name
+
+A `name` is required for any type of branch.
+It can be defined as a [glob](https://github.com/micromatch/micromatch#matching-features) in which case the definition will be expanded to one per matching branch existing in the repository.
+
+If `name` doesn't match to any branch existing in the repository, the definition will be ignored. For example the default configuration includes the definition `next` and `next-major` which will become active only when the branches `next` and/or `next-major` are created in the repository. This allow to define your workflow once with all potential branches you might use and have the effective configuration evolving as you create new branches.
+
+For example the configuration `['+([1-9])?(.{+([1-9]),x}).x', 'master', 'next']` will be expanded as:
+```js
+{
+  branches: [
+    {name: '1.x', range: '1.x', channel: '1.x'}, // Only after the `1.x` is created in the repo
+    {name: '2.x', range: '2.x', channel: '2.x'}, // Only after the `2.x` is created in the repo
+    {name: 'master'},
+    {name: 'next', channel: 'next'}, // Only after the `next` is created in the repo
+  ]
+}
+```
+
+### channel
+
+The `channel` can be defined for any branch type. If it's not defined, releases will be done on the default distribution channel (for example the `@latest` [dist-tag](https://docs.npmjs.com/cli/dist-tag) for npm).
+The value of `channel`, if defined, is generated with [Lodash template](https://lodash.com/docs#template) with the variable `name` available.
+
+For example the configuration `['master', {name: 'next', channel: 'channel-${name}'}]` will be expanded as:
+```js
+{
+  branches: [
+    {name: 'master'}, // `channel` is undefined so the default distribution channel will be used
+    {name: 'next', channel: 'channel-next'}, // `channel` is built with the template `channel-${name}`
+  ]
+}
+```
+
+### range
+
+A `range` only applies to maintenance branches, is required and must be formatted like `N.N.x` or `N.x` (`N` is a number). In case the `name` is formatted as a range (for example `1.x` or `1.5.x`) the branch will be considered a maintenance branch and the `name` value will be used for the `range`.
+
+For example the configuration `['1.1.x', '1.2.x', 'master']` will be expanded as:
+```js
+{
+  branches: [
+    {name: '1.1.x', range: '1.1.x', channel: '1.1.x'},
+    {name: '1.2.x', range: '1.2.x', channel: '1.2.x'},
+    {name: 'master'},
+  ]
+}
+```
+
+### prerelease
+
+A `prerelease` property applies only to pre-release branches, is required and The `prerelease` value must be valid per the [Semantic Versioning Specification](https://semver.org/#spec-item-9). It will determine the name of versions (for example if `prerelease` is set to `beta` the version be formatted like `2.0.0-beta.1`, `2.0.0-beta.2` etc...).
+If the `prerelease` property is set to `true` the `name` value will be used.
+
+The value of `prerelease`, if defined as a string, is generated with [Lodash template](https://lodash.com/docs#template) with the variable `name` available.
+
+For example the configuration `['master', {name: 'pre/rc', prerelease: '${name.replace(/^pre\\//g, "")}'}, {name: 'beta', prerelease: true}]` will be expanded as:
+```js
+{
+  branches: [
+    {name: 'master'},
+    {name: 'pre/rc', channel: 'pre/rc', prerelease: 'rc'}, // `prerelease` is built with the template `${name.replace(/^pre\\//g, "")}`
+    {name: 'beta', channel: 'beta', prerelease: 'beta'}, // `prerelease` is set to `beta` as it is the value of `name`
+  ]
+}
+```
+
+## Branch types
+
+### Release branches
+
+A release branch is the base type of branch used by **semantic-release** that allows to publish releases with a [semantic version](https://semver.org), optionally on a specific distribution channel. Distribution channels (for example [npm dist-tags](https://docs.npmjs.com/cli/dist-tag) or [Chrome release channels](https://www.chromium.org/getting-involved/dev-channel)) are a way to distribute new releases only to a subset of users in order to get early feedback. Later on those releases can be added to the general distribution channel to be made available to all users.
+
+**semantic-release** will automatically add releases to the corresponding distribution channel when code is [merged from a release branch to another](#merging-into-a-release-branch).
+
+A project must define a minimum of 1 release branch and can have a maximum of 3. The order of the release branch definitions is significant, as versions released on a given branch must always be higher than the last release made on the previous branch. This allow to avoid situation that would lead to an attempt to publish releases with the same version number but different codebase. When multiple release branches are configured and a commit that would create a version conflict is pushed, **semantic-release** will not perform the release and will throw an `EINVALIDNEXTVERSION` error, listing the problematic commits and the valid branches on which to move them.
+
+**Note:** With **semantic-release** as with most package managers, a release version must be unique, independently of the distribution channel on which it is available.
+
+See [publishing on distribution channels recipe](../recipes/distribution-channels.md) for a detailed example.
+
+#### Pushing to a release branch
+
+With the configuration `"branches": ["master", "next"]`, if the last release published from `master` is `1.0.0` then:
+- Only versions in range `1.x.x` can be published from `master`, so only `fix` and `feat` commits can be pushed to `master`
+- Only versions in range `>=2.0.0` release can be published from `next`, so a `BREAKING CHANGE` commit must be pushed first on `next` and can be followed by any type of commits
+
+With the configuration `"branches": ["master", "next", "next-major"]`, if the last release published from `master` is `1.0.0` then:
+- Only versions in range `1.0.x` can be published from `master`, so only `fix` commits can be pushed to `master`
+- Only versions in range `>=1.1.0` can be published from `next`, so a `feat` commit must be pushed first on `next` and can be followed by `fix` and `feat` commits
+- Only versions in range `>=2.0.0` release can be published from `next`, so a `BREAKING CHANGE` commit must be pushed first on `next-major` and can be followed by any type of commits
+
+Those verifications prevent situations such as:
+1. Create a `feat` commit on `next` which triggers the release of version `1.0.0` on channel `next`
+2. Merge `next` into `master` which adds `1.0.0` on the default channel
+3. Push a `fix` commit to `master` which triggers the release of version `1.0.1` on the default channel
+4. Push a `fix` commit to `next` which would attempt to release the version `1.0.1` on channel `next` and fails as this version already exists
+
+#### Merging into a release branch
+
+When merging commits associated with a release from one release branch to another, **semantic-release** will make the corresponding version available on the channel associated with the target branch.
+
+When merging commits not associated with a release, commits from a [maintenance branch](#maintenance-branches) or commits from a [pre-release branch](#pre-release-branches) **semantic-release** will treat them as [pushed commits](#pushing-to-a-release-branch) and publish a new release if necessary.
+
+### Maintenance branches
+
+A maintenance branch is a type of branch used by **semantic-release** that allows to publish releases with a [semantic version](https://semver.org) on top of the codebase of an old release. This is useful when you need to provide fixes or features to users who cannot upgrade to the last version of your package.
+
+A maintenance branch is characterized by a range which defines the versions that can be published from it. The [`range`](#range) value of each maintenance branch must be unique across the project.
+
+**semantic-release** will always publish releases to a distribution channel specific to the range, so only the users who choose to use that particular line of versions will receive new releases.
+
+Maintenance branches are always considered lower than [release branches](#release-branches) and similarly to them, when a commit that would create a version conflict is pushed, **semantic-release** will not perform the release and will throw an `EINVALIDNEXTVERSION` error, listing the problematic commits and the valid branches on which to move them.
+
+**semantic-release** will automatically add releases to the corresponding distribution channel when code is [merged from a release or maintenance branch to another maintenance branch](#merging-into-a-maintenance-branch), however only version version within the branch `range` can be merged. Ia merged version is outside the maintenance branch `range` **semantic-release** will not add to the corresponding channel and will throw an `EINVALIDMAINTENANCEMERGE` error.
+
+See [publishing maintenance releases recipe](../recipes/maintenance-releases.md) for a detailed example.
+
+#### Pushing to a maintenance branch
+
+With the configuration `"branches": ["1.0.x", "1.x", "master"]`, if the last release published from `master` is `1.5.0` then:
+- Only versions in range `>=1.0.0 <1.1.0` can be published from `1.0.x`, so only `fix` commits can be pushed to `1.0.x`
+- Only versions in range `>=1.1.0 <1.5.0` can be published from `1.x`, so only `fix` and `feat` commits can be pushed to `1.x` as long the resulting release is lower than `1.5.0`
+- Once `2.0.0` is released from `master`, versions in range `>=1.1.0 <2.0.0` can be published from `1.x`, so any number of `fix` and `feat` commits can be pushed to `1.x`
+
+#### Merging into a maintenance branch
+
+With the configuration `"branches": ["1.0.x", "1.x", "master"]`, if the last release published from `master` is `1.0.0` then:
+- Creating the branch `1.0.x` from `master` will make the `1.0.0` release available on the `1.0.x` distribution channel
+- Pushing a `fix` commit on the `1.0.x` branch will release the version `1.0.1` on the `1.0.x` distribution channel
+- Creating the branch `1.x` from `master` will make the `1.0.0` release available on the `1.x` distribution channel
+- Merging the branch `1.0.x` into `1.x` will make the version `1.0.1` available on the `1.x` distribution channel
+
+### Pre-release branches
+
+A pre-release branch is a type of branch used by **semantic-release** that allows to publish releases with a [pre-release version](https://semver.org/#spec-item-9).
+Using a pre-release version allow to publish multiple releases with the same version. Those release will be differentiated via there identifiers (in `1.0.0-alpha.1` the identifier is `alpha.1`).
+This is useful when you need to work on a future major release that will include many breaking changes but you do not want to increment the version number for each breaking change commit.
+
+A pre-release branch is characterized by the `prerelease` property that defines the static part of the version released (in `1.0.0-alpha.1` the static part fo the identifier is `alpha`). The [`prerelease`](#prerelease) value of each pre-release branch must be unique across the project.
+
+**semantic-release** will always publish pre-releases to a specific distribution channel, so only the users who choose to use that particular line of versions will receive new releases.
+
+When merging commits associated with an existing release, **semantic-release** will treat them as [pushed commits](#pushing-to-a-pre-release-branch) and publish a new release if necessary, but it will never add those releases to the distribution channel corresponding to the pre-release branch.
+
+See [publishing pre-releases recipe](../recipes/pre-releases.md) for a detailed example.
+
+#### Pushing to a pre-release branch
+
+With the configuration `"branches": ["master", {"name": "beta", "prerelease": true}]`, if the last release published from `master` is `1.0.0` then:
+- Pushing a `BREAKING CHANGE` commit on the `beta` branch will release the version `2.0.0-beta.1` on the `beta` distribution channel
+- Pushing either a `fix`, `feat` or a `BREAKING CHANGE` commit on the `beta` branch will release the version `2.0.0-beta.2` (then `2.0.0-beta.3`, `2.0.0-beta.4`, etc...) on the `beta` distribution channel
+
+#### Merging into a pre-release branch
+
+With the configuration `"branches": ["master", {"name": "beta", "prerelease": true}]`, if the last release published from `master` is `1.0.0` and the last one published from `beta` is `2.0.0-beta.1` then:
+- Pushing a `fix` commit on the `master` branch will release the version `1.0.1` on the default distribution channel
+- Merging the branch `master` into `beta` will release the version `2.0.0-beta.2` on the `beta` distribution channel
@@ -1,8 +1,11 @@
-const {template, pick} = require('lodash');
+const {pick} = require('lodash');
 const marked = require('marked');
 const TerminalRenderer = require('marked-terminal');
 const envCi = require('env-ci');
 const hookStd = require('hook-std');
+const pEachSeries = require('p-each-series');
+const semver = require('semver');
+const AggregateError = require('aggregate-error');
 const pkg = require('./package.json');
 const hideSensitive = require('./lib/hide-sensitive');
 const getConfig = require('./lib/get-config');
@@ -10,21 +13,24 @@ const verify = require('./lib/verify');
 const getNextVersion = require('./lib/get-next-version');
 const getCommits = require('./lib/get-commits');
 const getLastRelease = require('./lib/get-last-release');
-const {extractErrors} = require('./lib/utils');
+const getReleasesToAdd = require('./lib/get-releases-to-add');
+const {extractErrors, makeTag} = require('./lib/utils');
 const getGitAuthUrl = require('./lib/get-git-auth-url');
+const getBranches = require('./lib/branches');
 const getLogger = require('./lib/get-logger');
-const {fetch, verifyAuth, isBranchUpToDate, gitHead: getGitHead, tag, push} = require('./lib/git');
+const {verifyAuth, isBranchUpToDate, getGitHead, tag, push} = require('./lib/git');
 const getError = require('./lib/get-error');
 const {COMMIT_NAME, COMMIT_EMAIL} = require('./lib/definitions/constants');

 marked.setOptions({renderer: new TerminalRenderer()});

+/* eslint complexity: ["warn", 25] */
 async function run(context, plugins) {
  const {cwd, env, options, logger} = context;
  const {isCi, branch: ciBranch, isPr} = envCi({env, cwd});

  if (!isCi && !options.dryRun && !options.noCi) {
-    logger.log('This run was not triggered in a known CI environment, running in dry-run mode.');
+    logger.warn('This run was not triggered in a known CI environment, running in dry-run mode.');
    options.dryRun = true;
  } else {
    // When running on CI, set the commits author and commiter info and prevent the `git` CLI to prompt for username/password. See #703.
@@ -44,29 +50,41 @@ async function run(context, plugins) {
    return false;
  }

-  if (ciBranch !== options.branch) {
+  // Verify config
+  await verify(context);
+
+  context.branches = await getBranches(context);
+  context.branch = context.branches.find(({name}) => name === ciBranch);
+
+  if (!context.branch) {
    logger.log(
-      `This test run was triggered on the branch ${ciBranch}, while semantic-release is configured to only publish from ${
-        options.branch
-      }, therefore a new version won’t be published.`
+      `This test run was triggered on the branch ${ciBranch}, while semantic-release is configured to only publish from ${context.branches
+        .map(({name}) => name)
+        .join(', ')}, therefore a new version won’t be published.`
    );
    return false;
  }
-  logger.success(`Run automated release from branch ${ciBranch}`);
-
-  await verify(context);
+  logger[options.dryRun ? 'warn' : 'success'](
+    `Run automated release from branch ${ciBranch}${options.dryRun ? ' in dry-run mode' : ''}`
+  );

  options.repositoryUrl = await getGitAuthUrl(context);

  try {
-    await verifyAuth(options.repositoryUrl, options.branch, {cwd, env});
-  } catch (error) {
-    if (!(await isBranchUpToDate(options.branch, {cwd, env}))) {
-      logger.log(
-        `The local branch ${options.branch} is behind the remote one, therefore a new version won't be published.`
-      );
-      return false;
+    try {
+      await verifyAuth(options.repositoryUrl, context.branch.name, {cwd, env});
+    } catch (error) {
+      if (!(await isBranchUpToDate(context.branch.name, {cwd, env}))) {
+        logger.log(
+          `The local branch ${
+            context.branch.name
+          } is behind the remote one, therefore a new version won't be published.`
+        );
+        return false;
+      }
+      throw error;
    }
+  } catch (error) {
    logger.error(`The command "${error.cmd}" failed with the error message ${error.stderr}.`);
    throw getError('EGITNOPERMISSION', {options});
  }
@@ -75,43 +93,92 @@ async function run(context, plugins) {

  await plugins.verifyConditions(context);

-  await fetch(options.repositoryUrl, {cwd, env});
+  const releasesToAdd = getReleasesToAdd(context);
+  const errors = [];
+  context.releases = [];
+
+  await pEachSeries(releasesToAdd, async ({lastRelease, currentRelease, nextRelease}) => {
+    if (context.branch['merge-range'] && !semver.satisfies(nextRelease.version, context.branch['merge-range'])) {
+      errors.push(getError('EINVALIDMAINTENANCEMERGE', {nextRelease, branch: context.branch}));
+      return;
+    }
+
+    const commits = await getCommits({...context, lastRelease, nextRelease});
+    nextRelease.notes = await plugins.generateNotes({...context, commits, lastRelease, nextRelease});
+
+    logger.log('Create tag %s', nextRelease.gitTag);
+    await tag(nextRelease.gitTag, nextRelease.gitHead, {cwd, env});
+    await push(options.repositoryUrl, context.branch.name, {cwd, env});
+    context.branch.tags.push({
+      version: nextRelease.version,
+      channel: nextRelease.channel,
+      gitTag: nextRelease.gitTag,
+      gitHead: nextRelease.gitHead,
+    });
+
+    const releases = await plugins.addChannel({...context, commits, lastRelease, currentRelease, nextRelease});
+    context.releases.push(...releases);
+    await plugins.success({...context, lastRelease, commits, nextRelease, releases});
+  });
+
+  if (errors.length > 0) {
+    throw new AggregateError(errors);
+  }

  context.lastRelease = await getLastRelease(context);
+
  context.commits = await getCommits(context);

-  const nextRelease = {type: await plugins.analyzeCommits(context), gitHead: await getGitHead({cwd, env})};
-
+  const nextRelease = {
+    type: await plugins.analyzeCommits(context),
+    channel: context.branch.channel,
+    gitHead: await getGitHead({cwd, env}),
+  };
  if (!nextRelease.type) {
    logger.log('There are no relevant changes, so no new version is released.');
-    return false;
+    return context.releases.length > 0 ? {releases: context.releases} : false;
  }
+
  context.nextRelease = nextRelease;
  nextRelease.version = getNextVersion(context);
-  nextRelease.gitTag = template(options.tagFormat)({version: nextRelease.version});
+  nextRelease.gitTag = makeTag(options.tagFormat, nextRelease.version, nextRelease.channel);
+  nextRelease.name = makeTag(options.tagFormat, nextRelease.version);
+
+  if (context.branch.type !== 'prerelease' && !semver.satisfies(nextRelease.version, context.branch.range)) {
+    throw getError('EINVALIDNEXTVERSION', {
+      ...context,
+      validBranches: context.branches.filter(
+        ({type, accept}) => type !== 'prerelease' && accept.includes(nextRelease.type)
+      ),
+    });
+  }

  await plugins.verifyRelease(context);

+  nextRelease.notes = await plugins.generateNotes(context);
+
+  await plugins.prepare(context);
+
  if (options.dryRun) {
-    const notes = await plugins.generateNotes(context);
-    logger.log(`Release note for version ${nextRelease.version}:`);
-    if (notes) {
-      context.stdout.write(marked(notes));
-    }
+    logger.warn(`Skip ${nextRelease.gitTag} tag creation in dry-run mode`);
  } else {
-    nextRelease.notes = await plugins.generateNotes(context);
-    await plugins.prepare(context);
-
    // Create the tag before calling the publish plugins as some require the tag to exists
-    await tag(nextRelease.gitTag, {cwd, env});
-    await push(options.repositoryUrl, options.branch, {cwd, env});
+    await tag(nextRelease.gitTag, nextRelease.gitHead, {cwd, env});
+    await push(options.repositoryUrl, context.branch.name, {cwd, env});
    logger.success(`Created tag ${nextRelease.gitTag}`);
+  }

-    context.releases = await plugins.publish(context);
+  context.releases.push(...(await plugins.publish(context)));

-    await plugins.success(context);
+  await plugins.success(context);

-    logger.success(`Published release ${nextRelease.version}`);
+  logger.success(`Published release ${nextRelease.version}`);
+
+  if (options.dryRun) {
+    logger.log(`Release note for version ${nextRelease.version}:`);
+    if (nextRelease.notes) {
+      context.stdout.write(marked(nextRelease.notes));
+    }
  }

  return pick(context, ['lastRelease', 'commits', 'nextRelease', 'releases']);
@@ -158,9 +225,7 @@ module.exports = async (opts = {}, {cwd = process.cwd(), env = process.env, stdo
      unhook();
      return result;
    } catch (error) {
-      if (!options.dryRun) {
-        await callFail(context, plugins, error);
-      }
+      await callFail(context, plugins, error);
      throw error;
    }
  } catch (error) {
@@ -0,0 +1,18 @@
+const {isString, remove, omit, mapValues, template} = require('lodash');
+const micromatch = require('micromatch');
+const {getBranches} = require('../git');
+
+module.exports = async ({cwd}, branches) => {
+  const gitBranches = await getBranches({cwd});
+
+  return branches.reduce(
+    (branches, branch) => [
+      ...branches,
+      ...remove(gitBranches, name => micromatch(gitBranches, branch.name).includes(name)).map(name => ({
+        name,
+        ...mapValues(omit(branch, 'name'), value => (isString(value) ? template(value)({name}) : value)),
+      })),
+    ],
+    []
+  );
+};
@@ -0,0 +1,39 @@
+const {template, escapeRegExp} = require('lodash');
+const semver = require('semver');
+const pReduce = require('p-reduce');
+const debug = require('debug')('semantic-release:get-tags');
+const {getTags, isRefInHistory, getTagHead} = require('../../lib/git');
+
+module.exports = async ({cwd, env, options: {tagFormat}}, branches) => {
+  // Generate a regex to parse tags formatted with `tagFormat`
+  // by replacing the `version` variable in the template by `(.+)`.
+  // The `tagFormat` is compiled with space as the `version` as it's an invalid tag character,
+  // so it's guaranteed to no be present in the `tagFormat`.
+  const tagRegexp = `^${escapeRegExp(template(tagFormat)({version: ' '})).replace(' ', '(.[^@]+)@?(.+)?')}`;
+  const tags = (await getTags({cwd, env}))
+    .map(tag => {
+      const [, version, channel] = tag.match(tagRegexp) || [];
+      return {gitTag: tag, version, channel};
+    })
+    .filter(({version}) => version && semver.valid(semver.clean(version)));
+
+  debug('found tags: %o', tags);
+
+  return pReduce(
+    branches,
+    async (branches, branch) => {
+      const branchTags = await pReduce(
+        tags,
+        async (tags, {gitTag, ...rest}) =>
+          (await isRefInHistory(gitTag, branch.name, true, {cwd, env}))
+            ? [...tags, {...rest, gitTag, gitHead: await getTagHead(gitTag, {cwd, env})}]
+            : tags,
+        []
+      );
+
+      debug('found tags for branch %s: %o', branch.name, branchTags);
+      return [...branches, {...branch, tags: branchTags}];
+    },
+    []
+  );
+};
@@ -0,0 +1,67 @@
+const {isString, isRegExp} = require('lodash');
+const AggregateError = require('aggregate-error');
+const pEachSeries = require('p-each-series');
+const DEFINITIONS = require('../definitions/branches');
+const getError = require('../get-error');
+const {fetch, verifyBranchName} = require('../git');
+const expand = require('./expand');
+const getTags = require('./get-tags');
+const normalize = require('./normalize');
+
+module.exports = async context => {
+  const {cwd, env} = context;
+
+  const remoteBranches = await expand(
+    context,
+    context.options.branches.map(branch => (isString(branch) || isRegExp(branch) ? {name: branch} : branch))
+  );
+
+  await pEachSeries(remoteBranches, async ({name}) => {
+    await fetch(name, {cwd, env});
+  });
+
+  const branches = await getTags(context, remoteBranches);
+
+  const errors = [];
+  const branchesByType = Object.entries(DEFINITIONS).reduce(
+    (branchesByType, [type, {filter}]) => ({[type]: branches.filter(filter), ...branchesByType}),
+    {}
+  );
+
+  const result = Object.entries(DEFINITIONS).reduce((result, [type, {branchesValidator, branchValidator}]) => {
+    branchesByType[type].forEach(branch => {
+      if (branchValidator && !branchValidator(branch)) {
+        errors.push(getError(`E${type.toUpperCase()}BRANCH`, {branch}));
+      }
+    });
+
+    const branchesOfType = normalize[type](branchesByType);
+
+    if (!branchesValidator(branchesOfType)) {
+      errors.push(getError(`E${type.toUpperCase()}BRANCHES`, {branches: branchesOfType}));
+    }
+
+    return {...result, [type]: branchesOfType};
+  }, {});
+
+  const duplicates = [...branches]
+    .map(branch => branch.name)
+    .sort()
+    .filter((val, idx, arr) => arr[idx] === arr[idx + 1] && arr[idx] !== arr[idx - 1]);
+
+  if (duplicates.length > 0) {
+    errors.push(getError('EDUPLICATEBRANCHES', {duplicates}));
+  }
+
+  await pEachSeries(branches, async branch => {
+    if (!(await verifyBranchName(branch.name))) {
+      errors.push(getError('EINVALIDBRANCHNAME', branch));
+    }
+  });
+
+  if (errors.length > 0) {
+    throw new AggregateError(errors);
+  }
+
+  return [...result.maintenance, ...result.release, ...result.prerelease];
+};
@@ -0,0 +1,110 @@
+const {sortBy} = require('lodash');
+const semver = require('semver');
+const semverDiff = require('semver-diff');
+const {FIRST_RELEASE, RELEASE_TYPE} = require('../definitions/constants');
+const {
+  tagsToVersions,
+  isMajorRange,
+  getUpperBound,
+  getLowerBound,
+  highest,
+  lowest,
+  getLatestVersion,
+  getFirstVersion,
+  getRange,
+} = require('../utils');
+
+function maintenance({maintenance, release}) {
+  return sortBy(
+    maintenance.map(({name, range, channel, ...rest}) => ({
+      ...rest,
+      name,
+      range: range || name,
+      channel: channel || name,
+    })),
+    'range'
+  ).map(({name, range, tags, ...rest}, idx, branches) => {
+    const versions = tagsToVersions(tags);
+    // Find the lower bound based on Maintenance branches
+    const maintenanceMin =
+      // If the current branch has a major range (1.x or 1.x.x) and the previous doesn't
+      isMajorRange(range) && branches[idx - 1] && !isMajorRange(branches[idx - 1].range)
+        ? // Then the lowest bound is the upper bound of the previous branch range
+          getUpperBound(branches[idx - 1].range)
+        : // Otherwise the lowest bound is the lowest bound of the current branch range
+          getLowerBound(range);
+    // The actual lower bound is the highest version between the current branch last release and `maintenanceMin`
+    const min = highest(getLatestVersion(versions) || FIRST_RELEASE, maintenanceMin);
+    // Determine the first release of the default branch not present in any maintenance branch
+    const base =
+      (release[0] &&
+        (getFirstVersion(tagsToVersions(release[0].tags), branches) ||
+          getLatestVersion(tagsToVersions(release[0].tags)))) ||
+      FIRST_RELEASE;
+    // The upper bound is the lowest version between the `base` version and the upper bound of the current branch range
+    const max = lowest(base, getUpperBound(range));
+    const diff = semverDiff(min, max);
+    return {
+      ...rest,
+      type: 'maintenance',
+      name,
+      tags,
+      range: getRange(min, max),
+      accept: diff ? RELEASE_TYPE.slice(0, RELEASE_TYPE.indexOf(diff)) : [],
+      'merge-range': getRange(maintenanceMin, getUpperBound(range)),
+    };
+  });
+}
+
+function release({release}) {
+  if (release.length === 0) {
+    return release;
+  }
+  const breakpoints = release.length > 2 ? ['minor', 'major'] : ['major'];
+
+  // The intial bound is the last release from the base branch of `FIRST_RELEASE` (1.0.0)
+  let bound = getLatestVersion(tagsToVersions(release[0].tags)) || FIRST_RELEASE;
+
+  return release.map(({name, tags, channel, ...rest}, idx) => {
+    const versions = tagsToVersions(tags);
+    // The lower bound is the highest version between the current branch last release and the previous branch upper bound (`bound`)
+    const min = highest(getLatestVersion(versions), bound);
+    if (release.length - 1 === idx) {
+      // If the current branch is the last one of the release branch, there is no upper bound
+      bound = undefined;
+    } else {
+      // The default upper bound is the lower bound increment with the release type of the current branch position
+      const upperBound = semver.inc(min, breakpoints[idx]);
+      // Find the lowest version that is present on the current branch but none of the previous ones
+      const nextFirstVersion = getFirstVersion(tagsToVersions(release[idx + 1].tags), release.slice(0, idx + 1));
+      // The upper bound is the lowest version between `nextFirstVersion` and the default upper bound
+      bound = lowest(nextFirstVersion, upperBound);
+    }
+    const diff = bound ? semverDiff(min, bound) : null;
+    return {
+      ...rest,
+      channel: idx === 0 ? channel : channel || name,
+      tags,
+      type: 'release',
+      name,
+      range: getRange(min, bound),
+      accept: bound ? RELEASE_TYPE.slice(0, RELEASE_TYPE.indexOf(diff)) : RELEASE_TYPE,
+    };
+  });
+}
+
+function prerelease({prerelease}) {
+  return prerelease.map(({name, prerelease, channel, tags, ...rest}) => {
+    const preid = prerelease === true ? name : prerelease;
+    return {
+      ...rest,
+      channel: channel || name,
+      type: 'prerelease',
+      name,
+      prerelease: preid,
+      tags,
+    };
+  });
+}
+
+module.exports = {maintenance, release, prerelease};
@@ -0,0 +1,23 @@
+const {isUndefined, uniqBy} = require('lodash');
+const semver = require('semver');
+const {isMaintenanceRange} = require('../utils');
+
+const maintenance = {
+  filter: ({name, range}) => !isUndefined(range) || isMaintenanceRange(name),
+  branchValidator: ({range}) => (isUndefined(range) ? true : isMaintenanceRange(range)),
+  branchesValidator: branches => uniqBy(branches, ({range}) => semver.validRange(range)).length === branches.length,
+};
+
+const prerelease = {
+  filter: ({prerelease}) => !isUndefined(prerelease),
+  branchValidator: ({name, prerelease}) =>
+    Boolean(prerelease) && Boolean(semver.valid(`1.0.0-${prerelease === true ? name : prerelease}.1`)),
+  branchesValidator: branches => uniqBy(branches, 'prerelease').length === branches.length,
+};
+
+const release = {
+  filter: branch => !maintenance.filter(branch) && !prerelease.filter(branch),
+  branchesValidator: branches => branches.length <= 3 && branches.length > 0,
+};
+
+module.exports = {maintenance, prerelease, release};
@@ -1,7 +1,9 @@
-const RELEASE_TYPE = ['major', 'premajor', 'minor', 'preminor', 'patch', 'prepatch', 'prerelease'];
+const RELEASE_TYPE = ['patch', 'minor', 'major'];

 const FIRST_RELEASE = '1.0.0';

+const FIRSTPRERELEASE = '1';
+
 const COMMIT_NAME = 'semantic-release-bot';

 const COMMIT_EMAIL = 'semantic-release-bot@martynus.net';
@@ -15,6 +17,7 @@ const SECRET_MIN_SIZE = 5;
 module.exports = {
  RELEASE_TYPE,
  FIRST_RELEASE,
+  FIRSTPRERELEASE,
  COMMIT_NAME,
  COMMIT_EMAIL,
  RELEASE_NOTES_SEPARATOR,
@@ -1,12 +1,14 @@
 const url = require('url');
 const {inspect} = require('util');
-const {toLower, isString} = require('lodash');
+const {toLower, isString, trim} = require('lodash');
 const pkg = require('../../package.json');
 const {RELEASE_TYPE} = require('./constants');

 const homepage = url.format({...url.parse(pkg.homepage), hash: null});
 const stringify = obj => (isString(obj) ? obj : inspect(obj, {breakLength: Infinity, depth: 2, maxArrayLength: 5}));
-const linkify = file => `${homepage}/blob/caribou/${file}`;
+const linkify = file => `${homepage}/blob/master/${file}`;
+const wordsList = words =>
+  `${words.slice(0, -1).join(', ')}${words.length > 1 ? ` or ${words[words.length - 1]}` : trim(words[0])}`;

 module.exports = {
  ENOGITREPO: ({cwd}) => ({
@@ -55,13 +57,11 @@ Your configuration for the \`tagFormat\` option is \`${stringify(tagFormat)}\`.`

 Your configuration for the \`tagFormat\` option is \`${stringify(tagFormat)}\`.`,
  }),
-  EPLUGINCONF: ({type, multiple, required, pluginConf}) => ({
+  EPLUGINCONF: ({type, required, pluginConf}) => ({
    message: `The \`${type}\` plugin configuration is invalid.`,
    details: `The [${type} plugin configuration](${linkify(`docs/usage/plugins.md#${toLower(type)}-plugin`)}) ${
      required ? 'is required and ' : ''
-    }must be ${
-      multiple ? 'a single or an array of plugins' : 'a single plugin'
-    } definition. A plugin definition is an npm module name, optionnaly wrapped in an array with an object.
+    } must be a single or an array of plugins definition. A plugin definition is an npm module name, optionnaly wrapped in an array with an object.

 Your configuration for the \`${type}\` plugin is \`${stringify(pluginConf)}\`.`,
  }),
@@ -127,4 +127,119 @@ We recommend to report the issue to the \`${pluginName}\` authors, providing the
      'docs/developer-guide/plugin.md'
    )})`,
  }),
+  EADDCHANNELOUTPUT: ({result, pluginName}) => ({
+    message: 'A `addChannel` plugin returned an invalid value. It must return an `Object`.',
+    details: `The \`addChannel\` plugins must return an \`Object\`.
+
+The \`addChannel\` function of the \`${pluginName}\` returned \`${stringify(result)}\` instead.
+
+We recommend to report the issue to the \`${pluginName}\` authors, providing the following informations:
+- The **semantic-release** version: \`${pkg.version}\`
+- The **semantic-release** logs from your CI job
+- The value returned by the plugin: \`${stringify(result)}\`
+- A link to the **semantic-release** plugin developer guide: [${linkify('docs/developer-guide/plugin.md')}](${linkify(
+      'docs/developer-guide/plugin.md'
+    )})`,
+  }),
+  EINVALIDBRANCH: ({branch}) => ({
+    message: 'A branch is invalid in the `branches` configuration.',
+    details: `Each branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must be either a string, a regexp or an object with a \`name\` property.
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EINVALIDBRANCHNAME: ({branch}) => ({
+    message: 'A branch name is invalid in the `branches` configuration.',
+    details: `Each branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must be a [valid Git reference](https://git-scm.com/docs/git-check-ref-format#_description).
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EDUPLICATEBRANCHES: ({duplicates}) => ({
+    message: 'The `branches` configuration has duplicate branches.',
+    details: `Each branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must havea unique name.
+
+Your configuration contains duplicates for the following branch names: \`${stringify(duplicates)}\`.`,
+  }),
+  EMAINTENANCEBRANCH: ({branch}) => ({
+    message: 'A maintenance branch is invalid in the `branches` configuration.',
+    details: `Each maintenance branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a \`range\` property formatted like \`N.x\`, \`N.x.x\` or \`N.N.x\` (\`N\` is a number).
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EMAINTENANCEBRANCHES: ({branches}) => ({
+    message: 'The maintenance branches are invalid in the `branches` configuration.',
+    details: `Each maintenance branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a unique \`range\` property.
+
+Your configuration for the problematic branches is \`${stringify(branches)}\`.`,
+  }),
+  ERELEASEBRANCHES: ({branches}) => ({
+    message: 'The release branches are invalid in the `branches` configuration.',
+    details: `A minimum of 1 and a maximum of 3 release branches are required in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}).
+
+Your configuration for the problematic branches is \`${stringify(branches)}\`.`,
+  }),
+  EPRERELEASEBRANCH: ({branch}) => ({
+    message: 'A pre-release branch configuration is invalid in the `branches` configuration.',
+    details: `Each pre-release branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a \`prerelease\` property valid per the [Semantic Versioning Specification](https://semver.org/#spec-item-9). If the \`prerelease\` property is set to \`true\`, then the \`name\` property is used instead.
+
+Your configuration for the problematic branch is \`${stringify(branch)}\`.`,
+  }),
+  EPRERELEASEBRANCHES: ({branches}) => ({
+    message: 'The pre-release branches are invalid in the `branches` configuration.',
+    details: `Each pre-release branch in the [branches configuration](${linkify(
+      'docs/usage/configuration.md#branches'
+    )}) must have a unique \`prerelease\` property. If the \`prerelease\` property is set to \`true\`, then the \`name\` property is used instead.
+
+Your configuration for the problematic branches is \`${stringify(branches)}\`.`,
+  }),
+  EINVALIDNEXTVERSION: ({nextRelease, branch, commits, validBranches}) => ({
+    message: `The release \`${nextRelease.version}\` on branch \`${
+      branch.name
+    }\` cannot be published as it is out of range.`,
+    details: `Based on the releases published on other branches, only versions within the range \`${
+      branch.range
+    }\` can be published from branch \`${branch.name}\`.
+
+The following commit${commits.length > 1 ? 's are' : ' is'} responsible for the invalid release:
+${commits.map(({commit: {short}, subject}) => `- ${subject} (${short})`).join('\n')}
+
+${
+      commits.length > 1 ? 'Those commits' : 'This commit'
+    } should be moved to a valid branch with [git merge](https://git-scm.com/docs/git-merge) or [git cherry-pick](https://git-scm.com/docs/git-cherry-pick) and removed from branch \`${
+      branch.name
+    }\` with [git revert](https://git-scm.com/docs/git-revert) or [git reset](https://git-scm.com/docs/git-reset).
+
+A valid branch could be ${wordsList(validBranches.map(({name}) => `\`${name}\``))}.
+
+See the [workflow configuration documentation](${linkify('docs/usage/workflow-configuration.md')}) for more details.`,
+  }),
+  EINVALIDMAINTENANCEMERGE: ({nextRelease, branch}) => ({
+    message: `The release \`${nextRelease.version}\` on branch \`${
+      branch.name
+    }\` cannot be published as it is out of range.`,
+    details: `Only releases within the range \`${branch['merge-range']}\` can be merged into the maintenance branch \`${
+      branch.name
+    }\` and published to the \`${nextRelease.channel}\` distribution channel.
+
+The branch \`${
+      branch.name
+    }\` head should be [reset](https://git-scm.com/docs/git-reset) to a previous commit so the commit with tag \`${
+      nextRelease.gitTag
+    }\` is removed from the branch history.
+
+See the [workflow configuration documentation](${linkify('docs/usage/workflow-configuration.md')}) for more details.`,
+  }),
 };
@@ -1,34 +1,40 @@
 const {isString, isPlainObject} = require('lodash');
-const {gitHead} = require('../git');
+const {getGitHead} = require('../git');
 const hideSensitive = require('../hide-sensitive');
 const {hideSensitiveValues} = require('../utils');
 const {RELEASE_TYPE, RELEASE_NOTES_SEPARATOR} = require('./constants');

 module.exports = {
  verifyConditions: {
-    multiple: true,
    required: false,
+    dryRun: true,
    pipelineConfig: () => ({settleAll: true}),
  },
  analyzeCommits: {
    default: ['@semantic-release/commit-analyzer'],
-    multiple: false,
    required: true,
+    dryRun: true,
    outputValidator: output => !output || RELEASE_TYPE.includes(output),
    preprocess: ({commits, ...inputs}) => ({
      ...inputs,
      commits: commits.filter(commit => !/\[skip\s+release\]|\[release\s+skip\]/i.test(commit.message)),
    }),
-    postprocess: ([result]) => result,
+    postprocess: results =>
+      RELEASE_TYPE[
+        results.reduce((highest, result) => {
+          const typeIndex = RELEASE_TYPE.indexOf(result);
+          return typeIndex > highest ? typeIndex : highest;
+        }, -1)
+      ],
  },
  verifyRelease: {
-    multiple: true,
    required: false,
+    dryRun: true,
    pipelineConfig: () => ({settleAll: true}),
  },
  generateNotes: {
-    multiple: true,
    required: false,
+    dryRun: true,
    outputValidator: output => !output || isString(output),
    pipelineConfig: () => ({
      getNextInput: ({nextRelease, ...context}, notes) => ({
@@ -42,16 +48,15 @@ module.exports = {
    postprocess: (results, {env}) => hideSensitive(env)(results.filter(Boolean).join(RELEASE_NOTES_SEPARATOR)),
  },
  prepare: {
-    multiple: true,
    required: false,
-    pipelineConfig: ({generateNotes}, logger) => ({
+    dryRun: false,
+    pipelineConfig: ({generateNotes}) => ({
      getNextInput: async context => {
-        const newGitHead = await gitHead({cwd: context.cwd});
+        const newGitHead = await getGitHead({cwd: context.cwd});
        // If previous prepare plugin has created a commit (gitHead changed)
        if (context.nextRelease.gitHead !== newGitHead) {
          context.nextRelease.gitHead = newGitHead;
          // Regenerate the release notes
-          logger.log('Call plugin %s', 'generateNotes');
          context.nextRelease.notes = await generateNotes(context);
        }
        // Call the next prepare plugin with the updated `nextRelease`
@@ -60,27 +65,41 @@ module.exports = {
    }),
  },
  publish: {
-    multiple: true,
    required: false,
+    dryRun: false,
    outputValidator: output => !output || isPlainObject(output),
    pipelineConfig: () => ({
      // Add `nextRelease` and plugin properties to published release
      transform: (release, step, {nextRelease}) => ({
-        ...(isPlainObject(release) ? release : {}),
        ...nextRelease,
+        ...(release || {}),
+        ...step,
+      }),
+    }),
+  },
+  addChannel: {
+    default: ['@semantic-release/npm', '@semantic-release/github'],
+    required: false,
+    dryRun: false,
+    outputValidator: output => !output || isPlainObject(output),
+    pipelineConfig: () => ({
+      // Add `nextRelease` and plugin properties to published release
+      transform: (release, step, {nextRelease}) => ({
+        ...nextRelease,
+        ...(release || {}),
        ...step,
      }),
    }),
  },
  success: {
-    multiple: true,
    required: false,
+    dryRun: false,
    pipelineConfig: () => ({settleAll: true}),
    preprocess: ({releases, env, ...inputs}) => ({...inputs, env, releases: hideSensitiveValues(env, releases)}),
  },
  fail: {
-    multiple: true,
    required: false,
+    dryRun: false,
    pipelineConfig: () => ({settleAll: true}),
    preprocess: ({errors, env, ...inputs}) => ({...inputs, env, errors: hideSensitiveValues(env, errors)}),
  },
@@ -1,6 +1,5 @@
-const gitLogParser = require('git-log-parser');
-const getStream = require('get-stream');
 const debug = require('debug')('semantic-release:get-commits');
+const {getCommits} = require('./git');

 /**
 * Retrieve the list of commits on the current branch since the commit sha associated with the last release, or all the commits of the current branch if there is no last released version.
@@ -9,21 +8,15 @@ const debug = require('debug')('semantic-release:get-commits');
 *
 * @return {Promise<Array<Object>>} The list of commits on the branch `branch` since the last release.
 */
-module.exports = async ({cwd, env, lastRelease: {gitHead}, logger}) => {
-  if (gitHead) {
-    debug('Use gitHead: %s', gitHead);
+module.exports = async ({cwd, env, lastRelease: {gitHead: from}, nextRelease: {gitHead: to = 'HEAD'} = {}, logger}) => {
+  if (from) {
+    debug('Use from: %s', from);
  } else {
    logger.log('No previous release found, retrieving all commits');
  }

-  Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}});
-  const commits = (await getStream.array(
-    gitLogParser.parse({_: `${gitHead ? gitHead + '..' : ''}HEAD`}, {cwd, env: {...process.env, ...env}})
-  )).map(commit => {
-    commit.message = commit.message.trim();
-    commit.gitTags = commit.gitTags.trim();
-    return commit;
-  });
+  const commits = await getCommits(from, to, {cwd, env});
+
  logger.log(`Found ${commits.length} commits since last release`);
  debug('Parsed commits: %o', commits);
  return commits;
@@ -6,6 +6,7 @@ const debug = require('debug')('semantic-release:config');
 const {repoUrl} = require('./git');
 const PLUGINS_DEFINITIONS = require('./definitions/plugins');
 const plugins = require('./plugins');
+const {validatePlugin, parseConfig} = require('./plugins/utils');

 const CONFIG_NAME = 'release';
 const CONFIG_FILES = [
@@ -20,7 +21,10 @@ const CONFIG_FILES = [

 module.exports = async (context, opts) => {
  const {cwd, env} = context;
-  const {config} = (await cosmiconfig(CONFIG_NAME, {searchPlaces: CONFIG_FILES}).search(cwd)) || {};
+  const {config, filepath} = (await cosmiconfig(CONFIG_NAME, {searchPlaces: CONFIG_FILES}).search(cwd)) || {};
+
+  debug('load config from: %s', filepath);
+
  // Merge config file options and CLI/API options
  let options = {...config, ...opts};
  const pluginsPath = {};
@@ -34,17 +38,21 @@ module.exports = async (context, opts) => {

        // For each plugin defined in a shareable config, save in `pluginsPath` the extendable config path,
        // so those plugin will be loaded relatively to the config file
-        Object.entries(extendsOpts).reduce((pluginsPath, [option, value]) => {
-          if (PLUGINS_DEFINITIONS[option] || option === 'plugins') {
-            castArray(value)
-              .filter(plugin => isString(plugin) || (isPlainObject(plugin) && isString(plugin.path)))
-              .map(plugin => (isString(plugin) ? plugin : plugin.path))
-              .forEach(plugin => {
-                pluginsPath[plugin] = extendPath;
-              });
-          }
-          return pluginsPath;
-        }, pluginsPath);
+        Object.entries(extendsOpts)
+          .filter(([, value]) => Boolean(value))
+          .reduce((pluginsPath, [option, value]) => {
+            castArray(value).forEach(plugin => {
+              if (option === 'plugins' && validatePlugin(plugin)) {
+                pluginsPath[parseConfig(plugin)[0]] = extendPath;
+              } else if (
+                PLUGINS_DEFINITIONS[option] &&
+                (isString(plugin) || (isPlainObject(plugin) && isString(plugin.path)))
+              ) {
+                pluginsPath[isString(plugin) ? plugin : plugin.path] = extendPath;
+              }
+            });
+            return pluginsPath;
+          }, pluginsPath);

        return {...result, ...extendsOpts};
      }, {}),
@@ -54,7 +62,14 @@ module.exports = async (context, opts) => {

  // Set default options values if not defined yet
  options = {
-    branch: 'master',
+    branches: [
+      '+([1-9])?(.{+([1-9]),x}).x',
+      'master',
+      'next',
+      'next-major',
+      {name: 'beta', prerelease: true},
+      {name: 'alpha', prerelease: true},
+    ],
    repositoryUrl: (await pkgRepoUrl({normalize: false, cwd})) || (await repoUrl({cwd, env})),
    tagFormat: `v\${version}`,
    plugins: [
@@ -65,6 +80,7 @@ module.exports = async (context, opts) => {
    ],
    // Remove `null` and `undefined` options so they can be replaced with default ones
    ...pickBy(options, option => !isNil(option)),
+    ...(options.branches ? {branches: castArray(options.branches)} : {}),
  };

  debug('options values: %O', options);
@@ -1,6 +1,5 @@
 const {parse, format} = require('url');
 const {isNil} = require('lodash');
-const gitUrlParse = require('git-url-parse');
 const hostedGitInfo = require('hosted-git-info');
 const {verifyAuth} = require('./git');

@@ -25,32 +24,34 @@ const GIT_TOKENS = {
 *
 * @return {String} The formatted Git repository URL.
 */
-module.exports = async ({cwd, env, options: {repositoryUrl, branch}}) => {
+module.exports = async ({cwd, env, branch, options: {repositoryUrl}}) => {
  const info = hostedGitInfo.fromUrl(repositoryUrl, {noGitPlus: true});
+  const {protocol, ...parsed} = parse(repositoryUrl);

  if (info && info.getDefaultRepresentation() === 'shortcut') {
    // Expand shorthand URLs (such as `owner/repo` or `gitlab:owner/repo`)
    repositoryUrl = info.https();
-  } else {
-    const {protocols} = gitUrlParse(repositoryUrl);
-
+  } else if (protocol && protocol.includes('http')) {
    // Replace `git+https` and `git+http` with `https` or `http`
-    if (protocols.includes('http') || protocols.includes('https')) {
-      repositoryUrl = format({...parse(repositoryUrl), protocol: protocols.includes('https') ? 'https' : 'http'});
-    }
+    repositoryUrl = format({...parsed, protocol: protocol.includes('https') ? 'https' : 'http', href: null});
  }

  // Test if push is allowed without transforming the URL (e.g. is ssh keys are set up)
  try {
-    await verifyAuth(repositoryUrl, branch, {cwd, env});
+    await verifyAuth(repositoryUrl, branch.name, {cwd, env});
  } catch (error) {
    const envVar = Object.keys(GIT_TOKENS).find(envVar => !isNil(env[envVar]));
    const gitCredentials = `${GIT_TOKENS[envVar] || ''}${env[envVar] || ''}`;
-    const {protocols, ...parsed} = gitUrlParse(repositoryUrl);
-    const protocol = protocols.includes('https') ? 'https' : protocols.includes('http') ? 'http' : 'https';

-    // If credentials are set via anvironment variables, convert the URL to http/https and add basic auth, otherwise return `repositoryUrl` as is
-    return gitCredentials ? {...parsed, protocols: [protocol], user: gitCredentials}.toString(protocol) : repositoryUrl;
+    if (gitCredentials) {
+      // If credentials are set via anvironment variables, convert the URL to http/https and add basic auth, otherwise return `repositoryUrl` as is
+      const [match, auth, host, path] = /^(?!.+:\/\/)(?:(.*)@)?(.*?):(.*)$/.exec(repositoryUrl) || [];
+      return format({
+        ...parse(match ? `ssh://${auth ? `${auth}@` : ''}${host}/${path}` : repositoryUrl),
+        auth: gitCredentials,
+        protocol: protocol && /http[^s]/.test(protocol) ? 'http' : 'https',
+      });
+    }
  }

  return repositoryUrl;
@@ -1,8 +1,6 @@
-const {escapeRegExp, template} = require('lodash');
+const {isUndefined} = require('lodash');
 const semver = require('semver');
-const pLocate = require('p-locate');
-const debug = require('debug')('semantic-release:get-last-release');
-const {gitTags, isRefInHistory, gitTagHead} = require('./git');
+const {makeTag} = require('./utils');

 /**
 * Last release.
@@ -15,37 +13,27 @@ const {gitTags, isRefInHistory, gitTagHead} = require('./git');
 /**
 * Determine the Git tag and version of the last tagged release.
 *
- * - Obtain all the tags referencing commits in the current branch history
- * - Filter out the ones that are not valid semantic version or doesn't match the `tagFormat`
+ * - Filter out the branch tags that are not valid semantic version
 * - Sort the versions
 * - Retrive the highest version
 *
 * @param {Object} context semantic-release context.
+ * @param {Object} params Function parameters.
+ * @param {Object} params.before Find only releases with version number lower than this version.
 *
- * @return {Promise<LastRelease>} The last tagged release or `undefined` if none is found.
+ * @return {LastRelease} The last tagged release or empty object if none is found.
 */
-module.exports = async ({cwd, env, options: {tagFormat}, logger}) => {
-  // Generate a regex to parse tags formatted with `tagFormat`
-  // by replacing the `version` variable in the template by `(.+)`.
-  // The `tagFormat` is compiled with space as the `version` as it's an invalid tag character,
-  // so it's guaranteed to no be present in the `tagFormat`.
-  const tagRegexp = `^${escapeRegExp(template(tagFormat)({version: ' '})).replace(' ', '(.+)')}`;
-  const tags = (await gitTags({cwd, env}))
-    .map(tag => ({gitTag: tag, version: (tag.match(tagRegexp) || new Array(2))[1]}))
-    .filter(
-      tag => tag.version && semver.valid(semver.clean(tag.version)) && !semver.prerelease(semver.clean(tag.version))
-    )
+module.exports = ({branch: {name, tags, type}, options: {tagFormat}, logger}, {before} = {}) => {
+  const [{version, gitTag, gitHead, channel} = {}] = tags
+    .filter(tag => type === 'prerelease' || !semver.prerelease(tag.version))
+    .filter(tag => isUndefined(before) || semver.lt(tag.version, before))
    .sort((a, b) => semver.rcompare(a.version, b.version));

-  debug('found tags: %o', tags);
-
-  const tag = await pLocate(tags, tag => isRefInHistory(tag.gitTag, {cwd, env}), {preserveOrder: true});
-
-  if (tag) {
-    logger.log(`Found git tag ${tag.gitTag} associated with version ${tag.version}`);
-    return {gitHead: await gitTagHead(tag.gitTag, {cwd, env}), ...tag};
+  if (gitTag) {
+    logger.log(`Found git tag ${gitTag} associated with version ${version} on branch ${name}`);
+    return {version, gitTag, gitHead, channel, name: makeTag(tagFormat, version)};
  }

-  logger.log('No git tag version found');
+  logger.log(`No git tag version found on branch ${name}`);
  return {};
 };
@@ -3,7 +3,7 @@ const figures = require('figures');

 module.exports = ({stdout, stderr}) =>
  new Signale({
-    config: {displayTimestamp: true, underlineMessage: true, displayLabel: false},
+    config: {displayTimestamp: true, underlineMessage: false, displayLabel: false},
    disabled: false,
    interactive: false,
    scope: 'semantic-release',
@@ -1,13 +1,18 @@
 const semver = require('semver');
-const {FIRST_RELEASE} = require('./definitions/constants');
+const {FIRST_RELEASE, FIRSTPRERELEASE} = require('./definitions/constants');

-module.exports = ({nextRelease: {type}, lastRelease, logger}) => {
+module.exports = ({branch, nextRelease: {type}, lastRelease, logger}) => {
  let version;
  if (lastRelease.version) {
-    version = semver.inc(lastRelease.version, type);
-    logger.log(`The next release version is ${version}`);
+    version =
+      branch.type === 'prerelease'
+        ? semver.prerelease(lastRelease.version)
+          ? semver.inc(lastRelease.version, 'prerelease')
+          : `${semver.inc(lastRelease.version, type)}-${branch.prerelease}.${FIRSTPRERELEASE}`
+        : semver.inc(lastRelease.version, type);
+    logger.log('The next release version is %s', version);
  } else {
-    version = FIRST_RELEASE;
+    version = branch.type === 'prerelease' ? `${FIRST_RELEASE}-${branch.prerelease}.${FIRSTPRERELEASE}` : FIRST_RELEASE;
    logger.log(`There is no previous release, the next release version is ${version}`);
  }

@@ -0,0 +1,64 @@
+const {uniq} = require('lodash');
+const semver = require('semver');
+const semverDiff = require('semver-diff');
+const getLastRelease = require('./get-last-release');
+const {makeTag} = require('./utils');
+
+/**
+ * Find releases that have been merged from from a higher branch but not added on the channel of the current branch.
+ *
+ * @param {Object} context semantic-release context.
+ *
+ * @return {Array<Object>} Last release and next release to be added on the channel of the current branch.
+ */
+module.exports = context => {
+  const {
+    branch,
+    branches,
+    options: {tagFormat},
+  } = context;
+
+  return (
+    branches
+      // Consider only releases of higher branches
+      .slice(branches.findIndex(({name}) => name === branch.name) + 1)
+      // Exclude prerelease branches
+      .filter(({type}) => type !== 'prerelease')
+      // Find higher branch releases merged to building branch but not released on associated channel
+      .reduce(
+        (releases, higherBranch) => [
+          ...releases,
+          // For all unique release version of the higher branch merged on current branch
+          ...uniq(branch.tags.filter(({channel}) => channel === higherBranch.channel))
+            // Find ones that are not released on the building branch channel
+            .filter(tag =>
+              branch.tags.every(
+                ({version, channel}) =>
+                  version !== tag.version || channel === higherBranch.channel || channel !== branch.channel
+              )
+            )
+            // Sort in ascending order to add the most recent release last
+            .sort((a, b) => semver.compare(a.version, b.version))
+            // Construct the last and next release to add to the building branch channel
+            .map(({version, gitHead, gitTag}) => {
+              const lastRelease = getLastRelease(context, {before: version});
+              const type = lastRelease.version ? semverDiff(lastRelease.version, version) : 'major';
+              const name = makeTag(tagFormat, version);
+              return {
+                lastRelease,
+                currentRelease: {type, version, channel: higherBranch.channel, gitTag, name, gitHead},
+                nextRelease: {
+                  type,
+                  version,
+                  channel: branch.channel,
+                  gitTag: makeTag(tagFormat, version, branch.channel),
+                  name,
+                  gitHead,
+                },
+              };
+            }),
+        ],
+        []
+      )
+  );
+};
@@ -1,15 +1,20 @@
+const {matches, pick, memoize} = require('lodash');
+const gitLogParser = require('git-log-parser');
+const getStream = require('get-stream');
 const execa = require('execa');
 const debug = require('debug')('semantic-release:git');

+Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}});
+
 /**
 * Get the commit sha for a given tag.
 *
- * @param {string} tagName Tag name for which to retrieve the commit sha.
+ * @param {String} tagName Tag name for which to retrieve the commit sha.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
- * @return {string} The commit sha of the tag in parameter or `null`.
+ * @return {String} The commit sha of the tag in parameter or `null`.
 */
-async function gitTagHead(tagName, execaOpts) {
+async function getTagHead(tagName, execaOpts) {
  try {
    return await execa.stdout('git', ['rev-list', '-1', tagName], execaOpts);
  } catch (error) {
@@ -25,27 +30,75 @@ async function gitTagHead(tagName, execaOpts) {
 * @return {Array<String>} List of git tags.
 * @throws {Error} If the `git` command fails.
 */
-async function gitTags(execaOpts) {
+async function getTags(execaOpts) {
  return (await execa.stdout('git', ['tag'], execaOpts))
    .split('\n')
    .map(tag => tag.trim())
-    .filter(tag => Boolean(tag));
+    .filter(Boolean);
 }

 /**
- * Verify if the `ref` is in the direct history of the current branch.
+ * Retrieve a range of commits.
+ *
+ * @param {String} from to includes all commits made after this sha (does not include this sha).
+ * @param {String} to to includes all commits made before this sha (also include this sha).
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ * @return {Promise<Array<Object>>} The list of commits between `from` and `to`.
+ */
+async function getCommits(from, to, execaOpts) {
+  return (await getStream.array(
+    gitLogParser.parse(
+      {_: `${from ? from + '..' : ''}${to}`},
+      {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}}
+    )
+  )).map(({message, gitTags, ...commit}) => ({...commit, message: message.trim(), gitTags: gitTags.trim()}));
+}
+
+/**
+ * Get all the repository branches.
 *
- * @param {string} ref The reference to look for.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
- * @return {boolean} `true` if the reference is in the history of the current branch, falsy otherwise.
+ * @return {Array<String>} List of git branches.
+ * @throws {Error} If the `git` command fails.
 */
-async function isRefInHistory(ref, execaOpts) {
+async function getBranches(execaOpts) {
+  return (await execa.stdout('git', ['ls-remote', '--heads', 'origin'], execaOpts))
+    .split('\n')
+    .map(branch => branch.match(/^.+refs\/heads\/(.+)$/)[1])
+    .filter(Boolean);
+}
+
+const getBranchCommits = memoize((branch, execaOpts) =>
+  getStream.array(gitLogParser.parse({_: branch}, {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}}))
+);
+
+/**
+ * Verify if the `ref` is in the direct history of a given branch.
+ *
+ * @param {String} ref The reference to look for.
+ * @param {String} branch The branch for which to check if the `ref` is in history.
+ * @param {Boolean} findRebasedTags Weither consider in history tags associated with a commit that was rebased to another branch (i.e. GitHub Rebase and Merge feature).
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ *
+ * @return {Boolean} `true` if the reference is in the history of the current branch, falsy otherwise.
+ */
+async function isRefInHistory(ref, branch, findRebasedTags, execaOpts) {
+  if (!(await isRefExists(branch, execaOpts))) {
+    return false;
+  }
+
  try {
-    await execa('git', ['merge-base', '--is-ancestor', ref, 'HEAD'], execaOpts);
+    await execa('git', ['merge-base', '--is-ancestor', ref, branch], execaOpts);
    return true;
  } catch (error) {
    if (error.code === 1) {
+      if (findRebasedTags) {
+        const [tagCommit] = await getStream.array(
+          gitLogParser.parse({_: ref, n: '1'}, {cwd: execaOpts.cwd, env: {...process.env, ...execaOpts.env}})
+        );
+        return (await getBranchCommits(branch, execaOpts)).some(matches(pick(tagCommit, ['message', 'author'])));
+      }
      return false;
    }

@@ -54,17 +107,49 @@ async function isRefInHistory(ref, execaOpts) {
  }
 }

+/**
+ * Verify if the `ref` exits
+ *
+ * @param {String} ref The reference to verify.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ *
+ * @return {Boolean} `true` if the reference exists, falsy otherwise.
+ */
+async function isRefExists(ref, execaOpts) {
+  try {
+    return (await execa('git', ['rev-parse', '--verify', ref], execaOpts)).code === 0;
+  } catch (error) {
+    debug(error);
+  }
+}
+
 /**
 * Unshallow the git repository if necessary and fetch all the tags.
 *
- * @param {String} repositoryUrl The remote repository URL.
+ * @param {String} branch The repository branch to fetch.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 */
-async function fetch(repositoryUrl, execaOpts) {
+async function fetch(branch, execaOpts) {
+  const isLocalExists =
+    (await execa('git', ['rev-parse', '--verify', branch], {...execaOpts, reject: false})).code === 0;
+
  try {
-    await execa('git', ['fetch', '--unshallow', '--tags', repositoryUrl], execaOpts);
+    await execa(
+      'git',
+      [
+        'fetch',
+        '--unshallow',
+        '--tags',
+        ...(isLocalExists ? [] : ['origin', `+refs/heads/${branch}:refs/heads/${branch}`]),
+      ],
+      execaOpts
+    );
  } catch (error) {
-    await execa('git', ['fetch', '--tags', repositoryUrl], execaOpts);
+    await execa(
+      'git',
+      ['fetch', '--tags', ...(isLocalExists ? [] : ['origin', `+refs/heads/${branch}:refs/heads/${branch}`])],
+      execaOpts
+    );
  }
 }

@@ -73,9 +158,9 @@ async function fetch(repositoryUrl, execaOpts) {
 *
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
- * @return {string} the sha of the HEAD commit.
+ * @return {String} the sha of the HEAD commit.
 */
-function gitHead(execaOpts) {
+function getGitHead(execaOpts) {
  return execa.stdout('git', ['rev-parse', 'HEAD'], execaOpts);
 }

@@ -113,7 +198,7 @@ async function isGitRepo(execaOpts) {
 * Verify the write access authorization to remote repository with push dry-run.
 *
 * @param {String} repositoryUrl The remote repository URL.
- * @param {String} branch The repositoru branch for which to verify write access.
+ * @param {String} branch The repository branch for which to verify write access.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
 * @throws {Error} if not authorized to push.
@@ -131,12 +216,13 @@ async function verifyAuth(repositoryUrl, branch, execaOpts) {
 * Tag the commit head on the local repository.
 *
 * @param {String} tagName The name of the tag.
+ * @param {String} ref The Git reference to tag.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
 * @throws {Error} if the tag creation failed.
 */
-async function tag(tagName, execaOpts) {
-  await execa('git', ['tag', tagName], execaOpts);
+async function tag(tagName, ref, execaOpts) {
+  await execa('git', ['tag', tagName, ref], execaOpts);
 }

 /**
@@ -149,16 +235,16 @@ async function tag(tagName, execaOpts) {
 * @throws {Error} if the push failed.
 */
 async function push(repositoryUrl, branch, execaOpts) {
-  await execa('git', ['push', '--tags', repositoryUrl, `HEAD:${branch}`], execaOpts);
+  await execa('git', ['push', '--tags', repositoryUrl], execaOpts);
 }

 /**
 * Verify a tag name is a valid Git reference.
 *
- * @param {string} tagName the tag name to verify.
+ * @param {String} tagName the tag name to verify.
 * @param {Object} [execaOpts] Options to pass to `execa`.
 *
- * @return {boolean} `true` if valid, falsy otherwise.
+ * @return {Boolean} `true` if valid, falsy otherwise.
 */
 async function verifyTagName(tagName, execaOpts) {
  try {
@@ -168,6 +254,22 @@ async function verifyTagName(tagName, execaOpts) {
  }
 }

+/**
+ * Verify a branch name is a valid Git reference.
+ *
+ * @param {String} branch the branch name to verify.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ *
+ * @return {Boolean} `true` if valid, falsy otherwise.
+ */
+async function verifyBranchName(branch, execaOpts) {
+  try {
+    return (await execa('git', ['check-ref-format', `refs/heads/${branch}`], execaOpts)).code === 0;
+  } catch (error) {
+    debug(error);
+  }
+}
+
 /**
 * Verify the local branch is up to date with the remote one.
 *
@@ -177,22 +279,23 @@ async function verifyTagName(tagName, execaOpts) {
 * @return {Boolean} `true` is the HEAD of the current local branch is the same as the HEAD of the remote branch, falsy otherwise.
 */
 async function isBranchUpToDate(branch, execaOpts) {
+  const remoteHead = await execa.stdout('git', ['ls-remote', '--heads', 'origin', branch], execaOpts);
  try {
-    return await isRefInHistory(
-      (await execa.stdout('git', ['ls-remote', '--heads', 'origin', branch], execaOpts)).match(/^(\w+)?/)[1],
-      execaOpts
-    );
+    return await isRefInHistory(remoteHead.match(/^(\w+)?/)[1], branch, false, execaOpts);
  } catch (error) {
    debug(error);
  }
 }

 module.exports = {
-  gitTagHead,
-  gitTags,
+  getTagHead,
+  getTags,
+  getCommits,
+  getBranches,
  isRefInHistory,
+  isRefExists,
  fetch,
-  gitHead,
+  getGitHead,
  repoUrl,
  isGitRepo,
  verifyAuth,
@@ -200,4 +303,5 @@ module.exports = {
  push,
  verifyTagName,
  isBranchUpToDate,
+  verifyBranchName,
 };
@@ -19,8 +19,12 @@ module.exports = (context, pluginsPath) => {
          if (isPlainObject(plugin)) {
            Object.entries(plugin).forEach(([type, func]) => {
              if (PLUGINS_DEFINITIONS[type]) {
-                Reflect.defineProperty(func, 'pluginName', {value: 'Inline plugin', writable: false, enumerable: true});
-                plugins[type] = [...(PLUGINS_DEFINITIONS[type].multiple ? plugins[type] || [] : []), [func, config]];
+                Reflect.defineProperty(func, 'pluginName', {
+                  value: isPlainObject(name) ? 'Inline plugin' : name,
+                  writable: false,
+                  enumerable: true,
+                });
+                plugins[type] = [...(plugins[type] || []), [func, config]];
              }
            });
          } else {
@@ -41,10 +45,7 @@ module.exports = (context, pluginsPath) => {
  options = {...plugins, ...options};

  const pluginsConf = Object.entries(PLUGINS_DEFINITIONS).reduce(
-    (
-      pluginsConf,
-      [type, {multiple, required, default: def, pipelineConfig, postprocess = identity, preprocess = identity}]
-    ) => {
+    (pluginsConf, [type, {required, default: def, pipelineConfig, postprocess = identity, preprocess = identity}]) => {
      let pluginOpts;

      if (isNil(options[type]) && def) {
@@ -52,12 +53,12 @@ module.exports = (context, pluginsPath) => {
      } else {
        // If an object is passed and the path is missing, merge it with step options
        if (isPlainObject(options[type]) && !options[type].path) {
-          options[type] = castArray(plugins[type]).map(
-            plugin => (plugin ? [plugin[0], Object.assign(plugin[1], options[type])] : plugin)
+          options[type] = castArray(plugins[type]).map(plugin =>
+            plugin ? [plugin[0], Object.assign(plugin[1], options[type])] : plugin
          );
        }
-        if (!validateStep({multiple, required}, options[type])) {
-          errors.push(getError('EPLUGINCONF', {type, multiple, required, pluginConf: options[type]}));
+        if (!validateStep({required}, options[type])) {
+          errors.push(getError('EPLUGINCONF', {type, required, pluginConf: options[type]}));
          return pluginsConf;
        }
        pluginOpts = options[type];
@@ -1,4 +1,5 @@
 const {isPlainObject, isFunction, noop, cloneDeep, omit} = require('lodash');
+const debug = require('debug')('semantic-release:plugins');
 const getError = require('../get-error');
 const {extractErrors} = require('../utils');
 const PLUGINS_DEFINITIONS = require('../definitions/plugins');
@@ -14,6 +15,8 @@ module.exports = (context, type, pluginOpt, pluginsPath) => {
  const pluginName = name.pluginName ? name.pluginName : isFunction(name) ? `[Function: ${name.name}]` : name;
  const plugin = loadPlugin(context, name, pluginsPath);

+  debug(`options for ${pluginName}/${type}: %O`, config);
+
  let func;
  if (isFunction(plugin)) {
    func = plugin.bind(null, cloneDeep({...options, ...config}));
@@ -24,20 +27,23 @@ module.exports = (context, type, pluginOpt, pluginsPath) => {
  }

  const validator = async input => {
-    const {outputValidator} = PLUGINS_DEFINITIONS[type] || {};
+    const {dryRun, outputValidator} = PLUGINS_DEFINITIONS[type] || {};
    try {
-      logger.log(`Start step "${type}" of plugin "${pluginName}"`);
-      const result = await func({
-        ...cloneDeep(omit(input, ['stdout', 'stderr', 'logger'])),
-        stdout,
-        stderr,
-        logger: logger.scope(logger.scopeName, pluginName),
-      });
-      if (outputValidator && !outputValidator(result)) {
-        throw getError(`E${type.toUpperCase()}OUTPUT`, {result, pluginName});
+      if (!input.options.dryRun || dryRun) {
+        logger.log(`Start step "${type}" of plugin "${pluginName}"`);
+        const result = await func({
+          ...cloneDeep(omit(input, ['stdout', 'stderr', 'logger'])),
+          stdout,
+          stderr,
+          logger: logger.scope(logger.scopeName, pluginName),
+        });
+        if (outputValidator && !outputValidator(result)) {
+          throw getError(`E${type.toUpperCase()}OUTPUT`, {result, pluginName});
+        }
+        logger.success(`Completed step "${type}" of plugin "${pluginName}"`);
+        return result;
      }
-      logger.success(`Completed step "${type}" of plugin "${pluginName}"`);
-      return result;
+      logger.warn(`Skip step "${type}" of plugin "${pluginName}" in dry-run mode`);
    } catch (error) {
      logger.error(`Failed step "${type}" of plugin "${pluginName}"`);
      extractErrors(error).forEach(err => Object.assign(err, {pluginName}));
@@ -2,28 +2,25 @@ const {dirname} = require('path');
 const {isString, isFunction, castArray, isArray, isPlainObject, isNil} = require('lodash');
 const resolveFrom = require('resolve-from');

-const validateStepArrayDefinition = conf =>
-  isArray(conf) &&
-  (conf.length === 1 || conf.length === 2) &&
-  (isString(conf[0]) || isFunction(conf[0])) &&
-  (isNil(conf[1]) || isPlainObject(conf[1]));
+const validateSteps = conf => {
+  return conf.every(conf => {
+    if (
+      isArray(conf) &&
+      (conf.length === 1 || conf.length === 2) &&
+      (isString(conf[0]) || isFunction(conf[0])) &&
+      (isNil(conf[1]) || isPlainObject(conf[1]))
+    ) {
+      return true;
+    }
+    conf = castArray(conf);

-const validateSingleStep = conf => {
-  if (validateStepArrayDefinition(conf)) {
-    return true;
-  }
-  conf = castArray(conf);
+    if (conf.length !== 1) {
+      return false;
+    }

-  if (conf.length !== 1) {
-    return false;
-  }
-
-  const [name, config] = parseConfig(conf[0]);
-  return (isString(name) || isFunction(name)) && isPlainObject(config);
-};
-
-const validateMultipleStep = conf => {
-  return conf.every(conf => validateSingleStep(conf));
+    const [name, config] = parseConfig(conf[0]);
+    return (isString(name) || isFunction(name)) && isPlainObject(config);
+  });
 };

 function validatePlugin(conf) {
@@ -37,12 +34,12 @@ function validatePlugin(conf) {
  );
 }

-function validateStep({multiple, required}, conf) {
+function validateStep({required}, conf) {
  conf = castArray(conf).filter(Boolean);
  if (required) {
-    return conf.length >= 1 && (multiple ? validateMultipleStep : validateSingleStep)(conf);
+    return conf.length >= 1 && validateSteps(conf);
  }
-  return conf.length === 0 || (multiple ? validateMultipleStep : validateSingleStep)(conf);
+  return conf.length === 0 || validateSteps(conf);
 }

 function loadPlugin({cwd}, name, pluginsPath) {
@@ -1,4 +1,5 @@
-const {isFunction} = require('lodash');
+const {isFunction, union, template} = require('lodash');
+const semver = require('semver');
 const hideSensitive = require('./hide-sensitive');

 function extractErrors(err) {
@@ -17,4 +18,71 @@ function hideSensitiveValues(env, objs) {
  });
 }

-module.exports = {extractErrors, hideSensitiveValues};
+function tagsToVersions(tags) {
+  return tags.map(({version}) => version);
+}
+
+function isMajorRange(range) {
+  return /^\d\.x(?:\.x)?$/i.test(range);
+}
+
+function isMaintenanceRange(range) {
+  return /^\d\.[\dx](?:\.x)?$/i.test(range);
+}
+
+function getUpperBound(range) {
+  return semver.valid(range) ? range : ((semver.validRange(range) || '').match(/<(\d\.\d\.\d)$/) || [])[1];
+}
+
+function getLowerBound(range) {
+  return ((semver.validRange(range) || '').match(/(\d\.\d\.\d)/) || [])[1];
+}
+
+function highest(version1, version2) {
+  return version1 && version2 ? (semver.gt(version1, version2) ? version1 : version2) : version1 || version2;
+}
+
+function lowest(version1, version2) {
+  return version1 && version2 ? (semver.lt(version1, version2) ? version1 : version2) : version1 || version2;
+}
+
+function getLatestVersion(versions, {withPrerelease} = {}) {
+  return versions.filter(version => withPrerelease || !semver.prerelease(version)).sort(semver.rcompare)[0];
+}
+
+function getEarliestVersion(versions, {withPrerelease} = {}) {
+  return versions.filter(version => withPrerelease || !semver.prerelease(version)).sort(semver.compare)[0];
+}
+
+function getFirstVersion(versions, lowerBranches) {
+  const lowerVersion = union(...lowerBranches.map(({tags}) => tagsToVersions(tags))).sort(semver.rcompare);
+  if (lowerVersion[0]) {
+    return versions.sort(semver.compare).find(version => semver.gt(version, lowerVersion[0]));
+  }
+  return getEarliestVersion(versions);
+}
+
+function getRange(min, max) {
+  return `>=${min}${max ? ` <${max}` : ''}`;
+}
+
+function makeTag(tagFormat, version, channel) {
+  return template(tagFormat)({version: `${version}${channel ? `@${channel}` : ''}`});
+}
+
+module.exports = {
+  extractErrors,
+  hideSensitiveValues,
+  tagsToVersions,
+  isMajorRange,
+  isMaintenanceRange,
+  getUpperBound,
+  getLowerBound,
+  highest,
+  lowest,
+  getLatestVersion,
+  getEarliestVersion,
+  getFirstVersion,
+  getRange,
+  makeTag,
+};
@@ -1,9 +1,9 @@
-const {template} = require('lodash');
+const {template, isString, isPlainObject} = require('lodash');
 const AggregateError = require('aggregate-error');
 const {isGitRepo, verifyTagName} = require('./git');
 const getError = require('./get-error');

-module.exports = async ({cwd, env, options: {repositoryUrl, tagFormat}}) => {
+module.exports = async ({cwd, env, options: {repositoryUrl, tagFormat, branches}}) => {
  const errors = [];

  if (!(await isGitRepo({cwd, env}))) {
@@ -24,6 +24,14 @@ module.exports = async ({cwd, env, options: {repositoryUrl, tagFormat}}) => {
    errors.push(getError('ETAGNOVERSION', {tagFormat}));
  }

+  branches.forEach(branch => {
+    if (
+      !((isString(branch) && branch.trim()) || (isPlainObject(branch) && isString(branch.name) && branch.name.trim()))
+    ) {
+      errors.push(getError('EINVALIDBRANCH', {branch}));
+    }
+  });
+
  if (errors.length > 0) {
    throw new AggregateError(errors);
  }
@@ -19,31 +19,32 @@
    "Pierre Vanduynslager (https://twitter.com/@pvdlg_)"
  ],
  "dependencies": {
-    "@semantic-release/commit-analyzer": "^6.1.0",
+    "@semantic-release/commit-analyzer": "^7.0.0-beta.2",
    "@semantic-release/error": "^2.2.0",
-    "@semantic-release/github": "^5.1.0",
-    "@semantic-release/npm": "^5.0.5",
-    "@semantic-release/release-notes-generator": "^7.1.0",
+    "@semantic-release/github": "^5.3.0-beta.1",
+    "@semantic-release/npm": "^5.2.0-beta.1",
+    "@semantic-release/release-notes-generator": "^7.1.2",
    "aggregate-error": "^1.0.0",
    "cosmiconfig": "^5.0.1",
    "debug": "^4.0.0",
    "env-ci": "^3.0.0",
    "execa": "^1.0.0",
    "figures": "^2.0.0",
-    "find-versions": "^2.0.0",
+    "find-versions": "^3.0.0",
    "get-stream": "^4.0.0",
    "git-log-parser": "^1.2.0",
-    "git-url-parse": "^10.0.1",
    "hook-std": "^1.1.0",
    "hosted-git-info": "^2.7.1",
    "lodash": "^4.17.4",
    "marked": "^0.5.0",
    "marked-terminal": "^3.0.0",
-    "p-locate": "^3.0.0",
+    "micromatch": "3.1.5",
+    "p-each-series": "^1.0.0",
    "p-reduce": "^1.0.0",
    "read-pkg-up": "^4.0.0",
    "resolve-from": "^4.0.0",
    "semver": "^5.4.1",
+    "semver-diff": "^2.1.0",
    "signale": "^1.2.1",
    "yargs": "^12.0.0"
  },
@@ -111,10 +112,7 @@
    "trailingComma": "es5"
  },
  "publishConfig": {
-    "tag": "next"
-  },
-  "release": {
-    "branch": "caribou"
+    "access": "public"
  },
  "repository": {
    "type": "git",
@@ -0,0 +1,199 @@
+import test from 'ava';
+import {union} from 'lodash';
+import semver from 'semver';
+import proxyquire from 'proxyquire';
+
+const getBranch = (branches, branch) => branches.find(({name}) => name === branch);
+const release = (branches, name, version) => getBranch(branches, name).tags.push({version});
+const merge = (branches, source, target, tag) => {
+  getBranch(branches, target).tags = union(
+    getBranch(branches, source).tags.filter(({version}) => !tag || semver.cmp(version, '<=', tag)),
+    getBranch(branches, target).tags
+  );
+};
+
+test('Enforce ranges with branching release workflow', async t => {
+  const branches = [
+    {name: '1.x', tags: []},
+    {name: '1.0.x', tags: []},
+    {name: 'master', tags: []},
+    {name: 'next', tags: []},
+    {name: 'next-major', tags: []},
+    {name: 'beta', prerelease: true, tags: []},
+    {name: 'alpha', prerelease: true, tags: []},
+  ];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+
+  let result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.0 <1.0.0', 'Cannot release on 1.0.x before a releasing on master');
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.0', 'Cannot release on 1.x before a releasing on master');
+  t.is(getBranch(result, 'master').range, '>=1.0.0 <1.1.0', 'Can release only patch on master');
+  t.is(getBranch(result, 'next').range, '>=1.1.0 <2.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=2.0.0', 'Can release only major on next-major');
+
+  release(branches, 'master', '1.0.0');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.0 <1.0.0', 'Cannot release on 1.0.x before a releasing on master');
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.0', 'Cannot release on 1.x before a releasing on master');
+  t.is(getBranch(result, 'master').range, '>=1.0.0 <1.1.0', 'Can release only patch on master');
+
+  release(branches, 'master', '1.0.1');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.1 <1.1.0', 'Can release only patch, > than 1.0.1 on master');
+
+  merge(branches, 'master', 'next');
+  merge(branches, 'master', 'next-major');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.1 <1.1.0', 'Can release only patch, > than 1.0.1 on master');
+  t.is(getBranch(result, 'next').range, '>=1.1.0 <2.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=2.0.0', 'Can release only major on next-major');
+
+  release(branches, 'next', '1.1.0');
+  release(branches, 'next', '1.1.1');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'next').range, '>=1.1.1 <2.0.0', 'Can release only patch or minor, > than 1.1.0 on next');
+
+  release(branches, 'next-major', '2.0.0');
+  release(branches, 'next-major', '2.0.1');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'next-major').range, '>=2.0.1', 'Can release any version, > than 2.0.1 on next-major');
+
+  merge(branches, 'next-major', 'beta');
+  release(branches, 'beta', '3.0.0-beta.1');
+  merge(branches, 'beta', 'alpha');
+  release(branches, 'alpha', '4.0.0-alpha.1');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'next-major').range, '>=2.0.1', 'Can release any version, > than 2.0.1 on next-major');
+
+  merge(branches, 'master', '1.0.x');
+  merge(branches, 'master', '1.x');
+  release(branches, 'master', '1.0.1');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.1 <1.1.0', 'Can release only patch, > than 1.0.1 on master');
+  t.is(
+    getBranch(result, '1.0.x').range,
+    '>=1.0.1 <1.0.1',
+    'Cannot release on 1.0.x before >= 1.1.0 is released on master'
+  );
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.1', 'Cannot release on 1.x before >= 1.2.0 is released on master');
+
+  release(branches, 'master', '1.0.2');
+  release(branches, 'master', '1.0.3');
+  release(branches, 'master', '1.0.4');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.0.4 <1.1.0', 'Can release only patch, > than 1.0.4 on master');
+  t.is(
+    getBranch(result, '1.0.x').range,
+    '>=1.0.1 <1.0.2',
+    'Cannot release on 1.0.x before >= 1.1.0 is released on master'
+  );
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.2', 'Cannot release on 1.x before >= 1.2.0 is released on master');
+
+  merge(branches, 'next', 'master');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.1.1 <1.2.0', 'Can release only patch, > than 1.1.1 on master');
+  t.is(getBranch(result, 'next').range, '>=1.2.0 <2.0.0', 'Can release only patch or minor, > than 1.2.0 on next');
+  t.is(getBranch(result, 'next-major').range, '>=2.0.1', 'Can release any version, > than 2.0.1 on next-major');
+  t.is(
+    getBranch(result, '1.0.x').range,
+    '>=1.0.1 <1.0.2',
+    'Cannot release on 1.0.x before 1.0.x version from master are merged'
+  );
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.0.2', 'Cannot release on 1.x before >= 2.0.0 is released on master');
+
+  merge(branches, 'master', '1.0.x', '1.0.4');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.1.1 <1.2.0', 'Can release only patch, > than 1.1.1 on master');
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.4 <1.1.0', 'Can release on 1.0.x only within range');
+  t.is(getBranch(result, '1.x').range, '>=1.1.0 <1.1.0', 'Cannot release on 1.x before >= 2.0.0 is released on master');
+
+  merge(branches, 'master', '1.x');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=1.1.1 <1.2.0', 'Can release only patch, > than 1.1.1 on master');
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.4 <1.1.0', 'Can release on 1.0.x only within range');
+  t.is(getBranch(result, '1.x').range, '>=1.1.1 <1.1.1', 'Cannot release on 1.x before >= 2.0.0 is released on master');
+
+  merge(branches, 'next-major', 'next');
+  merge(branches, 'next', 'master');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=2.0.1 <2.1.0', 'Can release only patch, > than 2.0.1 on master');
+  t.is(getBranch(result, 'next').range, '>=2.1.0 <3.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=3.0.0', 'Can release only major on next-major');
+  t.is(getBranch(result, '1.x').range, '>=1.1.1 <2.0.0', 'Can release on 1.x only within range');
+
+  merge(branches, 'beta', 'master');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, 'master').range, '>=2.0.1 <2.1.0', 'Can release only patch, > than 2.0.1 on master');
+  t.is(getBranch(result, 'next').range, '>=2.1.0 <3.0.0', 'Can release only minor on next');
+  t.is(getBranch(result, 'next-major').range, '>=3.0.0', 'Can release only major on next-major');
+
+  branches.push({name: '1.1.x', tags: []});
+  merge(branches, '1.x', '1.1.x');
+  result = (await getBranches({options: {branches}})).map(({name, range}) => ({name, range}));
+  t.is(getBranch(result, '1.0.x').range, '>=1.0.4 <1.1.0', 'Can release on 1.0.x only within range');
+  t.is(getBranch(result, '1.1.x').range, '>=1.1.1 <1.2.0', 'Can release on 1.1.x only within range');
+  t.is(getBranch(result, '1.x').range, '>=1.2.0 <2.0.0', 'Can release on 1.x only within range');
+});
+
+test('Throw SemanticReleaseError for invalid configurations', async t => {
+  const branches = [
+    {name: '123', range: '123', tags: []},
+    {name: '1.x', tags: []},
+    {name: 'maintenance-1', range: '1.x', tags: []},
+    {name: '1.x.x', tags: []},
+    {name: 'beta', prerelease: '', tags: []},
+    {name: 'alpha', prerelease: 'alpha', tags: []},
+    {name: 'preview', prerelease: 'alpha', tags: []},
+  ];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+  const errors = [...(await t.throws(getBranches({options: {branches}})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EMAINTENANCEBRANCH');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+  t.is(errors[1].name, 'SemanticReleaseError');
+  t.is(errors[1].code, 'EMAINTENANCEBRANCHES');
+  t.truthy(errors[1].message);
+  t.truthy(errors[1].details);
+  t.is(errors[2].name, 'SemanticReleaseError');
+  t.is(errors[2].code, 'EPRERELEASEBRANCH');
+  t.truthy(errors[2].message);
+  t.truthy(errors[2].details);
+  t.is(errors[3].name, 'SemanticReleaseError');
+  t.is(errors[3].code, 'EPRERELEASEBRANCHES');
+  t.truthy(errors[3].message);
+  t.truthy(errors[3].details);
+  t.is(errors[4].name, 'SemanticReleaseError');
+  t.is(errors[4].code, 'ERELEASEBRANCHES');
+  t.truthy(errors[4].message);
+  t.truthy(errors[4].details);
+});
+
+test('Throw a SemanticReleaseError if there is duplicate branches', async t => {
+  const branches = [{name: 'master', tags: []}, {name: 'master', tags: []}];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+
+  const errors = [...(await t.throws(getBranches({options: {branches}})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EDUPLICATEBRANCHES');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+});
+
+test('Throw a SemanticReleaseError for each invalid branch name', async t => {
+  const branches = [{name: '~master', tags: []}, {name: '^master', tags: []}];
+  const getBranches = proxyquire('../../lib/branches', {'./get-tags': () => branches, './expand': () => []});
+
+  const errors = [...(await t.throws(getBranches({options: {branches}})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EINVALIDBRANCHNAME');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+  t.is(errors[1].name, 'SemanticReleaseError');
+  t.is(errors[1].code, 'EINVALIDBRANCHNAME');
+  t.truthy(errors[1].message);
+  t.truthy(errors[1].details);
+});
@@ -0,0 +1,54 @@
+import test from 'ava';
+import expand from '../../lib/branches/expand';
+import {gitRepo, gitCommits, gitCheckout, gitPush} from '../helpers/git-utils';
+
+test('Expand branches defined with globs', async t => {
+  const {cwd, repositoryUrl} = await gitRepo(true);
+  await gitCommits(['First'], {cwd});
+  await gitPush(repositoryUrl, 'master', {cwd});
+  await gitCheckout('1.1.x', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitPush(repositoryUrl, '1.1.x', {cwd});
+  await gitCheckout('1.x.x', true, {cwd});
+  await gitCommits(['Third'], {cwd});
+  await gitPush(repositoryUrl, '1.x.x', {cwd});
+  await gitCheckout('2.x', true, {cwd});
+  await gitCommits(['Fourth'], {cwd});
+  await gitPush(repositoryUrl, '2.x', {cwd});
+  await gitCheckout('next', true, {cwd});
+  await gitCommits(['Fifth'], {cwd});
+  await gitPush(repositoryUrl, 'next', {cwd});
+  await gitCheckout('pre/foo', true, {cwd});
+  await gitCommits(['Sixth'], {cwd});
+  await gitPush(repositoryUrl, 'pre/foo', {cwd});
+  await gitCheckout('pre/bar', true, {cwd});
+  await gitCommits(['Seventh'], {cwd});
+  await gitPush(repositoryUrl, 'pre/bar', {cwd});
+  await gitCheckout('beta', true, {cwd});
+  await gitCommits(['Eighth'], {cwd});
+  await gitPush(repositoryUrl, 'beta', {cwd});
+
+  const branches = [
+    // Should match all maintenance type branches
+    {name: '+([1-9])?(.{+([1-9]),x}).x'},
+    {name: 'master', channel: 'latest'},
+    {name: 'next'},
+    {name: 'pre/{foo,bar}', channel: `\${name.replace(/^pre\\//g, '')}`, prerelease: true},
+    // Should be ignored as there is no matching branches in the repo
+    {name: 'missing'},
+    // Should be ignored as the matching branch in the repo is already matched by `/^pre\\/(\\w+)$/gi`
+    {name: '*/foo', channel: 'foo', prerelease: 'foo'},
+    {name: 'beta', channel: `channel-\${name}`, prerelease: true},
+  ];
+
+  t.deepEqual(await expand({cwd}, branches), [
+    {name: '1.1.x'},
+    {name: '1.x.x'},
+    {name: '2.x'},
+    {name: 'master', channel: 'latest'},
+    {name: 'next'},
+    {name: 'pre/bar', channel: 'bar', prerelease: true},
+    {name: 'pre/foo', channel: 'foo', prerelease: true},
+    {name: 'beta', channel: 'channel-beta', prerelease: true},
+  ]);
+});
@@ -0,0 +1,202 @@
+import test from 'ava';
+import getTags from '../../lib/branches/get-tags';
+import {gitRepo, gitCommits, gitTagVersion, gitCheckout, merge, changeAuthor} from '../helpers/git-utils';
+
+test('Get the valid tags', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitTagVersion('foo', undefined, {cwd});
+  await gitTagVersion('v2.0.0', undefined, {cwd});
+  commits.push(...(await gitCommits(['Second'], {cwd})));
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  commits.push(...(await gitCommits(['Third'], {cwd})));
+  await gitTagVersion('v3.0', undefined, {cwd});
+  commits.push(...(await gitCommits(['Fourth'], {cwd})));
+  await gitTagVersion('v3.0.0-beta.1', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `v\${version}`}}, [{name: 'master'}]);
+
+  t.deepEqual(result, [
+    {
+      name: 'master',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[1].hash},
+        {gitTag: 'v2.0.0', version: '2.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'v3.0.0-beta.1', version: '3.0.0-beta.1', channel: undefined, gitHead: commits[3].hash},
+      ],
+    },
+  ]);
+});
+
+test('Get the valid tags from multiple branches', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  await gitTagVersion('v1.0.0@1.x', undefined, {cwd});
+  commits.push(...(await gitCommits(['Second'], {cwd})));
+  await gitTagVersion('v1.1.0', undefined, {cwd});
+  await gitTagVersion('v1.1.0@1.x', undefined, {cwd});
+  await gitCheckout('1.x', true, {cwd});
+  await gitCheckout('master', false, {cwd});
+  commits.push(...(await gitCommits(['Third'], {cwd})));
+  await gitTagVersion('v2.0.0', undefined, {cwd});
+  await gitTagVersion('v2.0.0@next', undefined, {cwd});
+  await gitCheckout('next', true, {cwd});
+  commits.push(...(await gitCommits(['Fourth'], {cwd})));
+  await gitTagVersion('v3.0.0@next', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `v\${version}`}}, [
+    {name: '1.x'},
+    {name: 'master'},
+    {name: 'next'},
+  ]);
+
+  t.deepEqual(result, [
+    {
+      name: '1.x',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'v1.0.0@1.x', version: '1.0.0', channel: '1.x', gitHead: commits[0].hash},
+        {gitTag: 'v1.1.0', version: '1.1.0', channel: undefined, gitHead: commits[1].hash},
+        {gitTag: 'v1.1.0@1.x', version: '1.1.0', channel: '1.x', gitHead: commits[1].hash},
+      ],
+    },
+    {
+      name: 'master',
+      tags: [
+        ...result[0].tags,
+        {gitTag: 'v2.0.0', version: '2.0.0', channel: undefined, gitHead: commits[2].hash},
+        {gitTag: 'v2.0.0@next', version: '2.0.0', channel: 'next', gitHead: commits[2].hash},
+      ],
+    },
+    {
+      name: 'next',
+      tags: [...result[1].tags, {gitTag: 'v3.0.0@next', version: '3.0.0', channel: 'next', gitHead: commits[3].hash}],
+    },
+  ]);
+});
+
+test('Match the tag name from the begining of the string and the channel from the last "@"', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitTagVersion('prefix@v1.0.0', undefined, {cwd});
+  await gitTagVersion('prefix@v1.0.0@next', undefined, {cwd});
+  await gitTagVersion('prefix@v2.0.0', undefined, {cwd});
+  await gitTagVersion('prefix@v2.0.0@next', undefined, {cwd});
+  await gitTagVersion('other-prefix@v3.0.0', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}]);
+
+  t.deepEqual(result, [
+    {
+      name: 'master',
+      tags: [
+        {gitTag: 'prefix@v1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'prefix@v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: commits[0].hash},
+        {gitTag: 'prefix@v2.0.0', version: '2.0.0', channel: undefined, gitHead: commits[0].hash},
+        {gitTag: 'prefix@v2.0.0@next', version: '2.0.0', channel: 'next', gitHead: commits[0].hash},
+      ],
+    },
+  ]);
+});
+
+test('Return branches with and empty tags array if no valid tag is found', async t => {
+  const {cwd} = await gitRepo();
+  await gitCommits(['First'], {cwd});
+  await gitTagVersion('foo', undefined, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitTagVersion('v2.0.x', undefined, {cwd});
+  await gitCommits(['Third'], {cwd});
+  await gitTagVersion('v3.0', undefined, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}, {name: 'next'}]);
+
+  t.deepEqual(result, [{name: 'master', tags: []}, {name: 'next', tags: []}]);
+});
+
+test('Return branches with and empty tags array if no valid tag is found in history of configured branches', async t => {
+  const {cwd} = await gitRepo();
+  await gitCommits(['First'], {cwd});
+  await gitCheckout('other-branch', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  await gitTagVersion('v1.0.0@next', undefined, {cwd});
+  await gitTagVersion('v2.0.0', undefined, {cwd});
+  await gitTagVersion('v2.0.0@next', undefined, {cwd});
+  await gitTagVersion('v3.0.0', undefined, {cwd});
+  await gitTagVersion('v3.0.0@next', undefined, {cwd});
+  await gitCheckout('master', false, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `prefix@v\${version}`}}, [{name: 'master'}, {name: 'next'}]);
+
+  t.deepEqual(result, [{name: 'master', tags: []}, {name: 'next', tags: []}]);
+});
+
+test('Get the highest valid tag corresponding to the "tagFormat"', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+
+  await gitTagVersion('1.0.0', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `\${version}`}}, [{name: 'master'}]), [
+    {name: 'master', tags: [{gitTag: '1.0.0', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}]},
+  ]);
+
+  await gitTagVersion('foo-1.0.0-bar', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `foo-\${version}-bar`}}, [{name: 'master'}]), [
+    {name: 'master', tags: [{gitTag: 'foo-1.0.0-bar', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}]},
+  ]);
+
+  await gitTagVersion('foo-v1.0.0-bar', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `foo-v\${version}-bar`}}, [{name: 'master'}]), [
+    {
+      name: 'master',
+      tags: [{gitTag: 'foo-v1.0.0-bar', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}],
+    },
+  ]);
+
+  await gitTagVersion('(.+)/1.0.0/(a-z)', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `(.+)/\${version}/(a-z)`}}, [{name: 'master'}]), [
+    {
+      name: 'master',
+      tags: [{gitTag: '(.+)/1.0.0/(a-z)', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}],
+    },
+  ]);
+
+  await gitTagVersion('2.0.0-1.0.0-bar.1', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `2.0.0-\${version}-bar.1`}}, [{name: 'master'}]), [
+    {
+      name: 'master',
+      tags: [{gitTag: '2.0.0-1.0.0-bar.1', version: '1.0.0', channel: undefined, gitHead: commits[0].hash}],
+    },
+  ]);
+
+  await gitTagVersion('3.0.0-bar.2', undefined, {cwd});
+  t.deepEqual(await getTags({cwd, options: {tagFormat: `\${version}-bar.2`}}, [{name: 'master'}]), [
+    {name: 'master', tags: [{gitTag: '3.0.0-bar.2', version: '3.0.0', channel: undefined, gitHead: commits[0].hash}]},
+  ]);
+});
+
+test('Get the tag on branch where commits have been rebased', async t => {
+  const {cwd} = await gitRepo();
+  const commits = await gitCommits(['First'], {cwd});
+  await gitCheckout('next', true, {cwd});
+  commits.push(...(await gitCommits(['Second/n/n/commit body'], {cwd})));
+  await gitTagVersion('v1.0.0@next', undefined, {cwd});
+  await gitCheckout('master', false, {cwd});
+  await merge('next', {cwd});
+  // Simulate GitHub "Rebase and Merge" by changing the committer info, which will result in a new commit sha and losing the tag
+  await changeAuthor(commits[1].hash, {cwd});
+
+  const result = await getTags({cwd, options: {tagFormat: `v\${version}`}}, [{name: 'master'}, {name: 'next'}]);
+
+  t.deepEqual(result, [
+    {
+      name: 'master',
+      tags: [{gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: commits[1].hash}],
+    },
+    {
+      name: 'next',
+      tags: [{gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: commits[1].hash}],
+    },
+  ]);
+});
@@ -0,0 +1,307 @@
+import test from 'ava';
+import normalize from '../../lib/branches/normalize';
+
+const toTags = versions => versions.map(version => ({version}));
+
+test('Maintenance branches - initial state', t => {
+  const maintenance = [{name: '1.x', tags: []}, {name: '1.1.x', tags: []}, {name: '1.2.x', tags: []}];
+  const release = [{name: 'master', tags: []}];
+  t.deepEqual(
+    normalize
+      .maintenance({maintenance, release})
+      .map(({type, name, range, accept, channel, 'merge-range': maintenanceRange}) => ({
+        type,
+        name,
+        range,
+        accept,
+        channel,
+        'merge-range': maintenanceRange,
+      })),
+    [
+      {
+        type: 'maintenance',
+        name: '1.1.x',
+        range: '>=1.1.0 <1.0.0',
+        accept: [],
+        channel: '1.1.x',
+        'merge-range': '>=1.1.0 <1.2.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.2.x',
+        range: '>=1.2.0 <1.0.0',
+        accept: [],
+        channel: '1.2.x',
+        'merge-range': '>=1.2.0 <1.3.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.x',
+        range: '>=1.3.0 <1.0.0',
+        accept: [],
+        channel: '1.x',
+        'merge-range': '>=1.3.0 <2.0.0',
+      },
+    ]
+  );
+});
+
+test('Maintenance branches - cap range to first release present on default branch and not in any Maintenance one', t => {
+  const maintenance = [
+    {name: '1.x', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1', '1.3.0', '1.4.0', '1.5.0'])},
+    {name: 'name', range: '1.1.x', tags: toTags(['1.0.0', '1.0.1', '1.1.0', '1.1.1'])},
+    {name: '1.2.x', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1'])},
+    {name: '2.x.x', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1', '1.5.0'])},
+  ];
+  const release = [
+    {
+      name: 'master',
+      tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '1.2.1', '1.3.0', '1.4.0', '1.5.0', '1.6.0', '2.0.0']),
+    },
+  ];
+
+  t.deepEqual(
+    normalize
+      .maintenance({maintenance, release})
+      .map(({type, name, range, accept, channel, 'merge-range': maintenanceRange}) => ({
+        type,
+        name,
+        range,
+        accept,
+        channel,
+        'merge-range': maintenanceRange,
+      })),
+    [
+      {
+        type: 'maintenance',
+        name: 'name',
+        range: '>=1.1.1 <1.2.0',
+        accept: ['patch'],
+        channel: 'name',
+        'merge-range': '>=1.1.0 <1.2.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.2.x',
+        range: '>=1.2.1 <1.3.0',
+        accept: ['patch'],
+        channel: '1.2.x',
+        'merge-range': '>=1.2.0 <1.3.0',
+      },
+      {
+        type: 'maintenance',
+        name: '1.x',
+        range: '>=1.5.0 <1.6.0',
+        accept: ['patch'],
+        channel: '1.x',
+        'merge-range': '>=1.3.0 <2.0.0',
+      },
+      {
+        type: 'maintenance',
+        name: '2.x.x',
+        range: '>=2.0.0 <1.6.0',
+        accept: [],
+        channel: '2.x.x',
+        'merge-range': '>=2.0.0 <3.0.0',
+      },
+    ]
+  );
+});
+
+test('Maintenance branches - cap range to default branch last release if all release are also present on maintenance branch', t => {
+  const maintenance = [
+    {name: '1.x', tags: toTags(['1.0.0', '1.2.0', '1.3.0'])},
+    {name: '2.x.x', tags: toTags(['1.0.0', '1.2.0', '1.3.0', '2.0.0'])},
+  ];
+  const release = [{name: 'master', tags: toTags(['1.0.0', '1.2.0', '1.3.0', '2.0.0'])}];
+
+  t.deepEqual(
+    normalize
+      .maintenance({maintenance, release})
+      .map(({type, name, range, accept, channel, 'merge-range': maintenanceRange}) => ({
+        type,
+        name,
+        range,
+        accept,
+        channel,
+        'merge-range': maintenanceRange,
+      })),
+    [
+      {
+        type: 'maintenance',
+        name: '1.x',
+        range: '>=1.3.0 <2.0.0',
+        accept: ['patch', 'minor'],
+        channel: '1.x',
+        'merge-range': '>=1.0.0 <2.0.0',
+      },
+      {
+        type: 'maintenance',
+        name: '2.x.x',
+        range: '>=2.0.0 <2.0.0',
+        accept: [],
+        channel: '2.x.x',
+        'merge-range': '>=2.0.0 <3.0.0',
+      },
+    ]
+  );
+});
+
+test('Release branches - initial state', t => {
+  const release = [{name: 'master', tags: []}, {name: 'next', tags: []}, {name: 'next-major', tags: []}];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=1.0.0 <1.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=1.1.0 <2.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=2.0.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - 3 release branches', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.0.1', '1.0.2'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.0.1', '1.0.2', '1.1.0', '1.2.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.0.1', '1.0.2', '1.1.0', '1.2.0', '2.0.0', '2.0.1', '2.1.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=1.0.2 <1.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=1.2.0 <2.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=2.1.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - 2 release branches', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.0.1', '1.1.0', '1.1.1', '1.2.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.0.1', '1.1.0', '1.1.1', '1.2.0', '2.0.0', '2.0.1', '2.1.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=1.2.0 <2.0.0', accept: ['patch', 'minor'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=2.1.0', accept: ['patch', 'minor', 'major'], channel: 'next'},
+    ]
+  );
+});
+
+test('Release branches - 1 release branches', t => {
+  const release = [{name: 'master', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0'])}];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [{type: 'release', name: 'master', range: '>=1.2.0', accept: ['patch', 'minor', 'major'], channel: undefined}]
+  );
+});
+
+test('Release branches - cap ranges to first release only present on following branch', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.1.0', '1.2.0', '2.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0', '1.2.0', '2.0.0', '2.1.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.1.0', '1.2.0', '2.0.0', '2.1.0', '2.2.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=2.0.0 <2.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=2.1.0 <2.2.0', accept: ['patch'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=2.2.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - Handle missing previous tags in branch history', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '2.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0', '1.1.1', '1.2.0', '2.0.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=2.0.0 <3.0.0', accept: ['patch', 'minor'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=3.0.0', accept: ['patch', 'minor', 'major'], channel: 'next'},
+    ]
+  );
+});
+
+test('Release branches - enforce release gaps after downstream merge', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=2.0.0 <2.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=2.1.0 <3.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=3.0.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Release branches - limit releases on 2nd and 3rd branche based on 1st branch last release', t => {
+  const release = [
+    {name: 'master', tags: toTags(['1.0.0', '1.1.0', '2.0.0', '3.0.0'])},
+    {name: 'next', tags: toTags(['1.0.0', '1.1.0'])},
+    {name: 'next-major', tags: toTags(['1.0.0', '1.1.0', '2.0.0'])},
+  ];
+
+  t.deepEqual(
+    normalize.release({release}).map(({type, name, range, accept, channel}) => ({type, name, range, accept, channel})),
+    [
+      {type: 'release', name: 'master', range: '>=3.0.0 <3.1.0', accept: ['patch'], channel: undefined},
+      {type: 'release', name: 'next', range: '>=3.1.0 <4.0.0', accept: ['patch', 'minor'], channel: 'next'},
+      {
+        type: 'release',
+        name: 'next-major',
+        range: '>=4.0.0',
+        accept: ['patch', 'minor', 'major'],
+        channel: 'next-major',
+      },
+    ]
+  );
+});
+
+test('Prerelease branches', t => {
+  const prerelease = [{name: 'beta', prerelease: true, tags: []}, {name: 'alpha', prerelease: 'preview', tags: []}];
+
+  t.deepEqual(normalize.prerelease({prerelease}).map(({type, name, channel}) => ({type, name, channel})), [
+    {type: 'prerelease', name: 'beta', channel: 'beta'},
+    {type: 'prerelease', name: 'alpha', channel: 'alpha'},
+  ]);
+});
@@ -29,6 +29,7 @@ test.serial('Pass options to semantic-release API', async t => {
    '',
    '-b',
    'master',
+    'next',
    '-r',
    'https://github/com/owner/repo.git',
    '-t',
@@ -68,7 +69,7 @@ test.serial('Pass options to semantic-release API', async t => {

  const exitCode = await cli();

-  t.is(run.args[0][0].branch, 'master');
+  t.deepEqual(run.args[0][0].branches, ['master', 'next']);
  t.is(run.args[0][0].repositoryUrl, 'https://github/com/owner/repo.git');
  t.is(run.args[0][0].tagFormat, `v\${version}`);
  t.deepEqual(run.args[0][0].plugins, ['plugin1', 'plugin2']);
@@ -92,7 +93,7 @@ test.serial('Pass options to semantic-release API with alias arguments', async t
  const argv = [
    '',
    '',
-    '--branch',
+    '--branches',
    'master',
    '--repository-url',
    'https://github/com/owner/repo.git',
@@ -110,7 +111,7 @@ test.serial('Pass options to semantic-release API with alias arguments', async t

  const exitCode = await cli();

-  t.is(run.args[0][0].branch, 'master');
+  t.deepEqual(run.args[0][0].branches, ['master']);
  t.is(run.args[0][0].repositoryUrl, 'https://github/com/owner/repo.git');
  t.is(run.args[0][0].tagFormat, `v\${version}`);
  t.deepEqual(run.args[0][0].plugins, ['plugin1', 'plugin2']);
@@ -186,7 +187,7 @@ test.serial('Display help', async t => {
  t.is(exitCode, 0);
 });

-test.serial('Returns error code and prints help if called with a command', async t => {
+test.serial('Return error code and prints help if called with a command', async t => {
  const run = stub().resolves(true);
  const argv = ['', '', 'pre'];
  const cli = requireNoCache('../cli', {'.': run, process: {...process, argv}});
@@ -0,0 +1,86 @@
+import test from 'ava';
+import {maintenance, prerelease, release} from '../../lib/definitions/branches';
+
+test('A "maintenance" branch is identified by having a "range" property or a "name" formatted like "N.x", "N.x.x" or "N.N.x"', t => {
+  t.true(maintenance.filter({name: '1.x.x'}));
+  t.true(maintenance.filter({name: '1.0.x'}));
+  t.true(maintenance.filter({name: '1.x'}));
+  t.true(maintenance.filter({name: 'some-name', range: '1.x.x'}));
+  t.true(maintenance.filter({name: 'some-name', range: '1.1.x'}));
+  t.true(maintenance.filter({name: 'some-name', range: ''}));
+  t.true(maintenance.filter({name: 'some-name', range: null}));
+  t.true(maintenance.filter({name: 'some-name', range: false}));
+
+  t.false(maintenance.filter({name: 'some-name'}));
+  t.false(maintenance.filter({name: '1.0.0'}));
+  t.false(maintenance.filter({name: 'x.x.x'}));
+});
+
+test('A "maintenance" branches must have a "range" property formatted like "N.x", "N.x.x" or "N.N.x"', t => {
+  t.true(maintenance.branchValidator({name: 'some-name', range: '1.x.x'}));
+  t.true(maintenance.branchValidator({name: 'some-name', range: '1.1.x'}));
+
+  t.false(maintenance.branchValidator({name: 'some-name', range: '^1.0.0'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: '>=1.0.0 <2.0.0'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: '1.0.0'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: 'wrong-range'}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: ''}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: null}));
+  t.false(maintenance.branchValidator({name: 'some-name', range: false}));
+});
+
+test('The "maintenance" branches must have unique ranges', t => {
+  t.true(maintenance.branchesValidator([{range: '1.x.x'}, {range: '1.0.x'}]));
+
+  t.false(maintenance.branchesValidator([{range: '1.x.x'}, {range: '1.x.x'}]));
+  t.false(maintenance.branchesValidator([{range: '1.x.x'}, {range: '1.x'}]));
+});
+
+test('A "prerelease" branch is identified by having a range "prerelease" property', t => {
+  t.true(prerelease.filter({name: 'some-name', prerelease: true}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: 'beta'}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: ''}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: null}));
+  t.true(prerelease.filter({name: 'some-name', prerelease: false}));
+
+  t.false(prerelease.filter({name: 'some-name'}));
+});
+
+test('A "prerelease" branch must have a valid prerelease detonation in "prerelease" property or in "name" if "prerelease" is "true"', t => {
+  t.true(prerelease.branchValidator({name: 'beta', prerelease: true}));
+  t.true(prerelease.branchValidator({name: 'some-name', prerelease: 'beta'}));
+
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: ''}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: null}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: false}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: '000'}));
+  t.false(prerelease.branchValidator({name: 'some-name', prerelease: '#beta'}));
+  t.false(prerelease.branchValidator({name: '000', prerelease: true}));
+  t.false(prerelease.branchValidator({name: '#beta', prerelease: true}));
+});
+
+test('The "prerelease" branches must have unique "prerelease" property', t => {
+  t.true(prerelease.branchesValidator([{prerelease: 'beta'}, {prerelease: 'alpha'}]));
+
+  t.false(prerelease.branchesValidator([{range: 'beta'}, {range: 'beta'}, {range: 'alpha'}]));
+});
+
+test('A "release" branch is identified by not havin a "range" or "prerelease" property or a "name" formatted like "N.x", "N.x.x" or "N.N.x"', t => {
+  t.true(release.filter({name: 'some-name'}));
+
+  t.false(release.filter({name: '1.x.x'}));
+  t.false(release.filter({name: '1.0.x'}));
+  t.false(release.filter({name: 'some-name', range: '1.x.x'}));
+  t.false(release.filter({name: 'some-name', range: '1.1.x'}));
+  t.false(release.filter({name: 'some-name', prerelease: true}));
+  t.false(release.filter({name: 'some-name', prerelease: 'beta'}));
+});
+
+test('There must be between 1 and 3 release branches', t => {
+  t.true(release.branchesValidator([{name: 'branch1'}]));
+  t.true(release.branchesValidator([{name: 'branch1'}, {name: 'branch2'}]));
+  t.true(release.branchesValidator([{name: 'branch1'}, {name: 'branch2'}, {name: 'branch3'}]));
+
+  t.false(release.branchesValidator([]));
+  t.false(release.branchesValidator([{name: 'branch1'}, {name: 'branch2'}, {name: 'branch3'}, {name: 'branch4'}]));
+});
@@ -32,6 +32,16 @@ test('The "publish" plugin output, if defined, must be an object', t => {
  t.true(plugins.publish.outputValidator(''));
 });

+test('The "addChannel" plugin output, if defined, must be an object', t => {
+  t.false(plugins.addChannel.outputValidator(1));
+  t.false(plugins.addChannel.outputValidator('string'));
+
+  t.true(plugins.addChannel.outputValidator({}));
+  t.true(plugins.addChannel.outputValidator());
+  t.true(plugins.addChannel.outputValidator(null));
+  t.true(plugins.addChannel.outputValidator(''));
+});
+
 test('The "generateNotes" plugins output are concatenated with separator and sensitive data is hidden', t => {
  const env = {MY_TOKEN: 'secret token'};
  t.is(plugins.generateNotes.postprocess(['note 1', 'note 2'], {env}), `note 1${RELEASE_NOTES_SEPARATOR}note 2`);
@@ -51,3 +61,13 @@ test('The "generateNotes" plugins output are concatenated with separator and sen
    `Note 1: Exposing token ${SECRET_REPLACEMENT}${RELEASE_NOTES_SEPARATOR}Note 2: Exposing token ${SECRET_REPLACEMENT}`
  );
 });
+
+test('The "analyzeCommits" plugins output are reduced to the highest release type', t => {
+  t.is(plugins.analyzeCommits.postprocess(['major', 'minor']), 'major');
+  t.is(plugins.analyzeCommits.postprocess(['', 'minor']), 'minor');
+  t.is(plugins.analyzeCommits.postprocess([undefined, 'patch']), 'patch');
+  t.is(plugins.analyzeCommits.postprocess([null, 'patch']), 'patch');
+  t.is(plugins.analyzeCommits.postprocess(['wrong_type', 'minor']), 'minor');
+  t.is(plugins.analyzeCommits.postprocess([]), undefined);
+  t.is(plugins.analyzeCommits.postprocess(['wrong_type']), undefined);
+});
@@ -66,6 +66,25 @@ test('Get all commits since gitHead (from lastRelease) on a detached head repo',
  t.truthy(result[0].committer.name);
 });

+test('Get all commits between lastRelease.gitHead and a shas', async t => {
+  // Create a git repository, set the current working directory at the root of the repo
+  const {cwd} = await gitRepo();
+  // Add commits to the master branch
+  const commits = await gitCommits(['First', 'Second', 'Third'], {cwd});
+
+  // Retrieve the commits with the commits module, between commit 'First' and 'Third'
+  const result = await getCommits({
+    cwd,
+    lastRelease: {gitHead: commits[commits.length - 1].hash},
+    nextRelease: {gitHead: commits[1].hash},
+    logger: t.context.logger,
+  });
+
+  // Verify the commits created and retrieved by the module are identical
+  t.is(result.length, 1);
+  t.deepEqual(result, commits.slice(1, commits.length - 1));
+});
+
 test('Return empty array if lastRelease.gitHead is the last commit', async t => {
  // Create a git repository, set the current working directory at the root of the repo
  const {cwd} = await gitRepo();
@@ -6,7 +6,7 @@ import {omit} from 'lodash';
 import proxyquire from 'proxyquire';
 import {stub} from 'sinon';
 import yaml from 'js-yaml';
-import {gitRepo, gitCommits, gitShallowClone, gitAddConfig} from './helpers/git-utils';
+import {gitRepo, gitTagVersion, gitCommits, gitShallowClone, gitAddConfig} from './helpers/git-utils';

 const DEFAULT_PLUGINS = [
  '@semantic-release/commit-analyzer',
@@ -23,8 +23,10 @@ test.beforeEach(t => {
 test('Default values, reading repositoryUrl from package.json', async t => {
  const pkg = {repository: 'https://host.null/owner/package.git'};
  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
+  const {cwd} = await gitRepo(true);
  await gitCommits(['First'], {cwd});
+  await gitTagVersion('v1.0.0', undefined, {cwd});
+  await gitTagVersion('v1.1.0', undefined, {cwd});
  // Add remote.origin.url config
  await gitAddConfig('remote.origin.url', 'git@host.null:owner/repo.git', {cwd});
  // Create package.json in repository root
@@ -33,21 +35,35 @@ test('Default values, reading repositoryUrl from package.json', async t => {
  const {options: result} = await t.context.getConfig({cwd});

  // Verify the default options are set
-  t.is(result.branch, 'master');
+  t.deepEqual(result.branches, [
+    '+([1-9])?(.{+([1-9]),x}).x',
+    'master',
+    'next',
+    'next-major',
+    {name: 'beta', prerelease: true},
+    {name: 'alpha', prerelease: true},
+  ]);
  t.is(result.repositoryUrl, 'https://host.null/owner/package.git');
  t.is(result.tagFormat, `v\${version}`);
 });

 test('Default values, reading repositoryUrl from repo if not set in package.json', async t => {
  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
+  const {cwd} = await gitRepo(true);
  // Add remote.origin.url config
  await gitAddConfig('remote.origin.url', 'https://host.null/owner/module.git', {cwd});

  const {options: result} = await t.context.getConfig({cwd});

  // Verify the default options are set
-  t.is(result.branch, 'master');
+  t.deepEqual(result.branches, [
+    '+([1-9])?(.{+([1-9]),x}).x',
+    'master',
+    'next',
+    'next-major',
+    {name: 'beta', prerelease: true},
+    {name: 'alpha', prerelease: true},
+  ]);
  t.is(result.repositoryUrl, 'https://host.null/owner/module.git');
  t.is(result.tagFormat, `v\${version}`);
 });
@@ -62,7 +78,14 @@ test('Default values, reading repositoryUrl (http url) from package.json if not
  const {options: result} = await t.context.getConfig({cwd});

  // Verify the default options are set
-  t.is(result.branch, 'master');
+  t.deepEqual(result.branches, [
+    '+([1-9])?(.{+([1-9]),x}).x',
+    'master',
+    'next',
+    'next-major',
+    {name: 'beta', prerelease: true},
+    {name: 'alpha', prerelease: true},
+  ]);
  t.is(result.repositoryUrl, 'https://host.null/owner/module.git');
  t.is(result.tagFormat, `v\${version}`);
 });
@@ -73,7 +96,7 @@ test('Read options from package.json', async t => {
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
    generateNotes: 'generateNotes',
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -83,10 +106,11 @@ test('Read options from package.json', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from .releaserc.yml', async t => {
@@ -94,7 +118,7 @@ test('Read options from .releaserc.yml', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -104,10 +128,11 @@ test('Read options from .releaserc.yml', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from .releaserc.json', async t => {
@@ -115,7 +140,7 @@ test('Read options from .releaserc.json', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -125,10 +150,11 @@ test('Read options from .releaserc.json', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from .releaserc.js', async t => {
@@ -136,7 +162,7 @@ test('Read options from .releaserc.js', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -146,10 +172,11 @@ test('Read options from .releaserc.js', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read options from release.config.js', async t => {
@@ -157,7 +184,7 @@ test('Read options from release.config.js', async t => {
  const {cwd} = await gitRepo();
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -167,10 +194,11 @@ test('Read options from release.config.js', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from package.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Prioritise CLI/API parameters over file configuration and git repo', async t => {
@@ -181,11 +209,11 @@ test('Prioritise CLI/API parameters over file configuration and git repo', async
  cwd = await gitShallowClone(repositoryUrl);
  const pkgOptions = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_pkg'},
-    branch: 'branch_pkg',
+    branches: ['branch_pkg'],
  };
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_cli'},
-    branch: 'branch_cli',
+    branches: ['branch_cli'],
    repositoryUrl: 'http://cli-url.com/owner/package',
    tagFormat: `cli\${version}`,
    plugins: false,
@@ -196,10 +224,11 @@ test('Prioritise CLI/API parameters over file configuration and git repo', async

  const result = await t.context.getConfig({cwd}, options);

+  const expected = {...options, branches: ['branch_cli']};
  // Verify the options contains the plugin config from CLI/API
-  t.deepEqual(result.options, options);
+  t.deepEqual(result.options, expected);
  // Verify the plugins module is called with the plugin options from CLI/API
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Read configuration from file path in "extends"', async t => {
@@ -209,10 +238,10 @@ test('Read configuration from file path in "extends"', async t => {
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
    generateNotes: 'generateNotes',
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
-    plugins: false,
+    plugins: ['plugin-1', ['plugin-2', {plugin2Opt: 'value'}]],
  };
  // Create package.json and shareable.json in repository root
  await outputJson(path.resolve(cwd, 'package.json'), {release: pkgOptions});
@@ -220,13 +249,16 @@ test('Read configuration from file path in "extends"', async t => {

  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from shareable.json
-  t.deepEqual(result, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    analyzeCommits: './shareable.json',
    generateNotes: './shareable.json',
+    'plugin-1': './shareable.json',
+    'plugin-2': './shareable.json',
  });
 });

@@ -237,7 +269,7 @@ test('Read configuration from module path in "extends"', async t => {
  const options = {
    analyzeCommits: {path: 'analyzeCommits', param: 'analyzeCommits_param'},
    generateNotes: 'generateNotes',
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -246,12 +278,13 @@ test('Read configuration from module path in "extends"', async t => {
  await outputJson(path.resolve(cwd, 'package.json'), {release: pkgOptions});
  await outputJson(path.resolve(cwd, 'node_modules/shareable/index.json'), options);

-  const {options: results} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options, branches: ['test_branch']};
  // Verify the options contains the plugin config from shareable.json
-  t.deepEqual(results, options);
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    analyzeCommits: 'shareable',
    generateNotes: 'shareable',
@@ -265,14 +298,14 @@ test('Read configuration from an array of paths in "extends"', async t => {
  const options1 = {
    verifyRelease: 'verifyRelease1',
    analyzeCommits: {path: 'analyzeCommits1', param: 'analyzeCommits_param1'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const options2 = {
    verifyRelease: 'verifyRelease2',
    generateNotes: 'generateNotes2',
    analyzeCommits: {path: 'analyzeCommits2', param: 'analyzeCommits_param2'},
-    branch: 'test_branch',
+    branches: ['test_branch'],
    tagFormat: `v\${version}`,
    plugins: false,
  };
@@ -281,12 +314,13 @@ test('Read configuration from an array of paths in "extends"', async t => {
  await outputJson(path.resolve(cwd, 'shareable1.json'), options1);
  await outputJson(path.resolve(cwd, 'shareable2.json'), options2);

-  const {options: results} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {...options1, ...options2, branches: ['test_branch']};
  // Verify the options contains the plugin config from shareable1.json and shareable2.json
-  t.deepEqual(results, {...options1, ...options2});
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable1.json and shareable2.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options: {...options1, ...options2}});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    verifyRelease1: './shareable1.json',
    verifyRelease2: './shareable2.json',
@@ -301,7 +335,7 @@ test('Prioritize configuration from config file over "extends"', async t => {
  const {cwd} = await gitRepo();
  const pkgOptions = {
    extends: './shareable.json',
-    branch: 'test_pkg',
+    branches: ['test_pkg'],
    generateNotes: 'generateNotes',
    publish: [{path: 'publishPkg', param: 'publishPkg_param'}],
  };
@@ -309,7 +343,7 @@ test('Prioritize configuration from config file over "extends"', async t => {
    analyzeCommits: 'analyzeCommits',
    generateNotes: 'generateNotesShareable',
    publish: [{path: 'publishShareable', param: 'publishShareable_param'}],
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    tagFormat: `v\${version}`,
    plugins: false,
@@ -318,12 +352,13 @@ test('Prioritize configuration from config file over "extends"', async t => {
  await outputJson(path.resolve(cwd, 'package.json'), {release: pkgOptions});
  await outputJson(path.resolve(cwd, 'shareable.json'), options1);

-  const {options} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = omit({...options1, ...pkgOptions, branches: ['test_pkg']}, 'extends');
  // Verify the options contains the plugin config from package.json and shareable.json
-  t.deepEqual(options, omit({...options1, ...pkgOptions}, 'extends'));
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json and shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {cwd, options: omit({...options, ...pkgOptions}, 'extends')});
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    analyzeCommits: './shareable.json',
    generateNotesShareable: './shareable.json',
@@ -336,13 +371,13 @@ test('Prioritize configuration from cli/API options over "extends"', async t =>
  const {cwd} = await gitRepo();
  const cliOptions = {
    extends: './shareable2.json',
-    branch: 'branch_opts',
+    branches: ['branch_opts'],
    publish: [{path: 'publishOpts', param: 'publishOpts_param'}],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const pkgOptions = {
    extends: './shareable1.json',
-    branch: 'branch_pkg',
+    branches: ['branch_pkg'],
    generateNotes: 'generateNotes',
    publish: [{path: 'publishPkg', param: 'publishPkg_param'}],
  };
@@ -350,13 +385,13 @@ test('Prioritize configuration from cli/API options over "extends"', async t =>
    analyzeCommits: 'analyzeCommits1',
    generateNotes: 'generateNotesShareable1',
    publish: [{path: 'publishShareable', param: 'publishShareable_param1'}],
-    branch: 'test_branch1',
+    branches: ['test_branch1'],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const options2 = {
    analyzeCommits: 'analyzeCommits2',
    publish: [{path: 'publishShareable', param: 'publishShareable_param2'}],
-    branch: 'test_branch2',
+    branches: ['test_branch2'],
    tagFormat: `v\${version}`,
    plugins: false,
  };
@@ -365,15 +400,13 @@ test('Prioritize configuration from cli/API options over "extends"', async t =>
  await outputJson(path.resolve(cwd, 'shareable1.json'), options1);
  await outputJson(path.resolve(cwd, 'shareable2.json'), options2);

-  const {options} = await t.context.getConfig({cwd}, cliOptions);
+  const {options: result} = await t.context.getConfig({cwd}, cliOptions);

+  const expected = omit({...options2, ...pkgOptions, ...cliOptions, branches: ['branch_opts']}, 'extends');
  // Verify the options contains the plugin config from package.json and shareable2.json
-  t.deepEqual(options, omit({...options2, ...pkgOptions, ...cliOptions}, 'extends'));
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from package.json and shareable2.json
-  t.deepEqual(t.context.plugins.args[0][0], {
-    cwd,
-    options: omit({...options2, ...pkgOptions, ...cliOptions}, 'extends'),
-  });
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
 });

 test('Allow to unset properties defined in shareable config with "null"', async t => {
@@ -382,7 +415,7 @@ test('Allow to unset properties defined in shareable config with "null"', async
  const pkgOptions = {
    extends: './shareable.json',
    analyzeCommits: null,
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
    plugins: null,
  };
@@ -413,6 +446,7 @@ test('Allow to unset properties defined in shareable config with "null"', async
    },
    cwd,
  });
+
  t.deepEqual(t.context.plugins.args[0][1], {
    generateNotes: './shareable.json',
    analyzeCommits: './shareable.json',
@@ -426,7 +460,7 @@ test('Allow to unset properties defined in shareable config with "undefined"', a
  const pkgOptions = {
    extends: './shareable.json',
    analyzeCommits: undefined,
-    branch: 'test_branch',
+    branches: ['test_branch'],
    repositoryUrl: 'https://host.null/owner/module.git',
  };
  const options1 = {
@@ -439,18 +473,17 @@ test('Allow to unset properties defined in shareable config with "undefined"', a
  await writeFile(path.resolve(cwd, 'release.config.js'), `module.exports = ${format(pkgOptions)}`);
  await outputJson(path.resolve(cwd, 'shareable.json'), options1);

-  const {options} = await t.context.getConfig({cwd});
+  const {options: result} = await t.context.getConfig({cwd});

+  const expected = {
+    ...omit(options1, 'analyzeCommits'),
+    ...omit(pkgOptions, ['extends', 'analyzeCommits']),
+    branches: ['test_branch'],
+  };
  // Verify the options contains the plugin config from shareable.json
-  t.deepEqual(options, {...omit(options1, 'analyzeCommits'), ...omit(pkgOptions, ['extends', 'analyzeCommits'])});
+  t.deepEqual(result, expected);
  // Verify the plugins module is called with the plugin options from shareable.json
-  t.deepEqual(t.context.plugins.args[0][0], {
-    options: {
-      ...omit(options1, 'analyzeCommits'),
-      ...omit(pkgOptions, ['extends', 'analyzeCommits']),
-    },
-    cwd,
-  });
+  t.deepEqual(t.context.plugins.args[0][0], {options: expected, cwd});
  t.deepEqual(t.context.plugins.args[0][1], {
    generateNotes: './shareable.json',
    analyzeCommits: './shareable.json',
@@ -8,7 +8,7 @@ test('Return the same "git" formatted URL if "gitCredentials" is not defined', a
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'}}),
+    await getAuthUrl({cwd, env, branch: {name: 'master'}, options: {repositoryUrl: 'git@host.null:owner/repo.git'}}),
    'git@host.null:owner/repo.git'
  );
 });
@@ -17,7 +17,12 @@ test('Return the same "https" formatted URL if "gitCredentials" is not defined',
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'https://host.null/owner/repo.git'}}),
+    await getAuthUrl({
+      cwd,
+      env,
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/owner/repo.git'},
+    }),
    'https://host.null/owner/repo.git'
  );
 });
@@ -26,7 +31,12 @@ test('Return the "https" formatted URL if "gitCredentials" is not defined and re
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'git+https://host.null/owner/repo.git'}}),
+    await getAuthUrl({
+      cwd,
+      env,
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git+https://host.null/owner/repo.git'},
+    }),
    'https://host.null/owner/repo.git'
  );
 });
@@ -35,7 +45,7 @@ test('Do not add trailing ".git" if not present in the origian URL', async t =>
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo'}}),
+    await getAuthUrl({cwd, env, vranch: {name: 'master'}, options: {repositoryUrl: 'git@host.null:owner/repo'}}),
    'git@host.null:owner/repo'
  );
 });
@@ -47,7 +57,8 @@ test('Handle "https" URL with group and subgroup', async t => {
    await getAuthUrl({
      cwd,
      env,
-      options: {branch: 'master', repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
    }),
    'https://host.null/group/subgroup/owner/repo.git'
  );
@@ -60,7 +71,8 @@ test('Handle "git" URL with group and subgroup', async t => {
    await getAuthUrl({
      cwd,
      env,
-      options: {branch: 'master', repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
    }),
    'git@host.null:group/subgroup/owner/repo.git'
  );
@@ -70,7 +82,12 @@ test('Convert shorthand URL', async t => {
  const {cwd} = await gitRepo();

  t.is(
-    await getAuthUrl({cwd, env, options: {repositoryUrl: 'semanitc-release/semanitc-release'}}),
+    await getAuthUrl({
+      cwd,
+      env,
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'semanitc-release/semanitc-release'},
+    }),
    'https://github.com/semanitc-release/semanitc-release.git'
  );
 });
@@ -82,7 +99,8 @@ test('Convert GitLab shorthand URL', async t => {
    await getAuthUrl({
      cwd,
      env,
-      options: {branch: 'master', repositoryUrl: 'gitlab:semanitc-release/semanitc-release'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'gitlab:semanitc-release/semanitc-release'},
    }),
    'https://gitlab.com/semanitc-release/semanitc-release.git'
  );
@@ -95,7 +113,21 @@ test('Return the "https" formatted URL if "gitCredentials" is defined and reposi
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
+    }),
+    'https://user:pass@host.null/owner/repo.git'
+  );
+});
+
+test('Return the "https" formatted URL if "gitCredentials" is defined and repositoryUrl is a "git" URL without user', async t => {
+  const {cwd} = await gitRepo();
+
+  t.is(
+    await getAuthUrl({
+      cwd,
+      env: {...env, GIT_CREDENTIALS: 'user:pass'},
+      options: {branch: 'master', repositoryUrl: 'host.null:owner/repo.git'},
    }),
    'https://user:pass@host.null/owner/repo.git'
  );
@@ -108,7 +140,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined and reposi
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'https://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/owner/repo.git'},
    }),
    'https://user:pass@host.null/owner/repo.git'
  );
@@ -121,7 +154,8 @@ test('Return the "http" formatted URL if "gitCredentials" is defined and reposit
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'http://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'http://host.null/owner/repo.git'},
    }),
    'http://user:pass@host.null/owner/repo.git'
  );
@@ -134,7 +168,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined and reposi
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git+https://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git+https://host.null/owner/repo.git'},
    }),
    'https://user:pass@host.null/owner/repo.git'
  );
@@ -147,7 +182,8 @@ test('Return the "http" formatted URL if "gitCredentials" is defined and reposit
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git+http://host.null/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git+http://host.null/owner/repo.git'},
    }),
    'http://user:pass@host.null/owner/repo.git'
  );
@@ -160,7 +196,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GH_T
    await getAuthUrl({
      cwd,
      env: {...env, GH_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://token@host.null/owner/repo.git'
  );
@@ -173,7 +210,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GITH
    await getAuthUrl({
      cwd,
      env: {...env, GITHUB_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://token@host.null/owner/repo.git'
  );
@@ -186,7 +224,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GL_T
    await getAuthUrl({
      cwd,
      env: {...env, GL_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://gitlab-ci-token:token@host.null/owner/repo.git'
  );
@@ -199,7 +238,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "GITL
    await getAuthUrl({
      cwd,
      env: {...env, GITLAB_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://gitlab-ci-token:token@host.null/owner/repo.git'
  );
@@ -212,7 +252,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "BB_T
    await getAuthUrl({
      cwd,
      env: {...env, BB_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://x-token-auth:token@host.null/owner/repo.git'
  );
@@ -225,7 +266,8 @@ test('Return the "https" formatted URL if "gitCredentials" is defined with "BITB
    await getAuthUrl({
      cwd,
      env: {...env, BITBUCKET_TOKEN: 'token'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:owner/repo.git'},
    }),
    'https://x-token-auth:token@host.null/owner/repo.git'
  );
@@ -238,7 +280,8 @@ test('Handle "https" URL with group and subgroup, with "GIT_CREDENTIALS"', async
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'https://host.null/group/subgroup/owner/repo.git'},
    }),
    'https://user:pass@host.null/group/subgroup/owner/repo.git'
  );
@@ -251,7 +294,8 @@ test('Handle "git" URL with group and subgroup, with "GIT_CREDENTIALS', async t
    await getAuthUrl({
      cwd,
      env: {...env, GIT_CREDENTIALS: 'user:pass'},
-      options: {branch: 'master', repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
+      branch: {name: 'master'},
+      options: {repositoryUrl: 'git@host.null:group/subgroup/owner/repo.git'},
    }),
    'https://user:pass@host.null/group/subgroup/owner/repo.git'
  );
@@ -261,7 +305,12 @@ test('Do not add git credential to repositoryUrl if push is allowed', async t =>
  const {cwd, repositoryUrl} = await gitRepo(true);

  t.is(
-    await getAuthUrl({cwd, env: {...env, GIT_CREDENTIALS: 'user:pass'}, options: {branch: 'master', repositoryUrl}}),
+    await getAuthUrl({
+      cwd,
+      env: {...env, GIT_CREDENTIALS: 'user:pass'},
+      branch: {name: 'master'},
+      options: {repositoryUrl},
+    }),
    repositoryUrl
  );
 });
@@ -1,7 +1,6 @@
 import test from 'ava';
 import {stub} from 'sinon';
 import getLastRelease from '../lib/get-last-release';
-import {gitRepo, gitCommits, gitTagVersion, gitCheckout} from './helpers/git-utils';

 test.beforeEach(t => {
  // Stub the logger functions
@@ -9,143 +8,61 @@ test.beforeEach(t => {
  t.context.logger = {log: t.context.log};
 });

-test('Get the highest non-prerelease valid tag', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Create some commits and tags
-  await gitCommits(['First'], {cwd});
-  await gitTagVersion('foo', undefined, {cwd});
-  const commits = await gitCommits(['Second'], {cwd});
-  await gitTagVersion('v2.0.0', undefined, {cwd});
-  await gitCommits(['Third'], {cwd});
-  await gitTagVersion('v1.0.0', undefined, {cwd});
-  await gitCommits(['Fourth'], {cwd});
-  await gitTagVersion('v3.0', undefined, {cwd});
-  await gitCommits(['Fifth'], {cwd});
-  await gitTagVersion('v3.0.0-beta.1', undefined, {cwd});
+test('Get the highest non-prerelease valid tag', t => {
+  const result = getLastRelease({
+    branch: {
+      name: 'master',
+      tags: [
+        {version: '2.0.0', gitTag: 'v2.0.0', gitHead: '222'},
+        {version: '1.0.0', gitTag: 'v1.0.0', gitHead: '111'},
+        {version: '3.0.0-beta.1', gitTag: 'v3.0.0-beta.1@beta', gitHead: '333'},
+      ],
+      type: 'release',
+    },
+    options: {tagFormat: `v\${version}`},
+    logger: t.context.logger,
+  });

-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {gitHead: commits[0].hash, gitTag: 'v2.0.0', version: '2.0.0'});
-  t.deepEqual(t.context.log.args[0], ['Found git tag v2.0.0 associated with version 2.0.0']);
+  t.deepEqual(result, {version: '2.0.0', gitTag: 'v2.0.0', name: 'v2.0.0', gitHead: '222', channel: undefined});
+  t.deepEqual(t.context.log.args[0][0], 'Found git tag v2.0.0 associated with version 2.0.0 on branch master');
 });

-test('Get the highest tag in the history of the current branch', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Add commit to the master branch
-  await gitCommits(['First'], {cwd});
-  // Create the tag corresponding to version 1.0.0
-  // Create the new branch 'other-branch' from master
-  await gitCheckout('other-branch', true, {cwd});
-  // Add commit to the 'other-branch' branch
-  await gitCommits(['Second'], {cwd});
-  // Create the tag corresponding to version 3.0.0
-  await gitTagVersion('v3.0.0', undefined, {cwd});
-  // Checkout master
-  await gitCheckout('master', false, {cwd});
-  // Add another commit to the master branch
-  const commits = await gitCommits(['Third'], {cwd});
-  // Create the tag corresponding to version 2.0.0
-  await gitTagVersion('v2.0.0', undefined, {cwd});
-
-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {gitHead: commits[0].hash, gitTag: 'v2.0.0', version: '2.0.0'});
-});
-
-test('Match the tag name from the begining of the string', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  const commits = await gitCommits(['First'], {cwd});
-  await gitTagVersion('prefix/v1.0.0', undefined, {cwd});
-  await gitTagVersion('prefix/v2.0.0', undefined, {cwd});
-  await gitTagVersion('other-prefix/v3.0.0', undefined, {cwd});
-
-  const result = await getLastRelease({cwd, options: {tagFormat: `prefix/v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {gitHead: commits[0].hash, gitTag: 'prefix/v2.0.0', version: '2.0.0'});
-});
-
-test('Return empty object if no valid tag is found', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Create some commits and tags
-  await gitCommits(['First'], {cwd});
-  await gitTagVersion('foo', undefined, {cwd});
-  await gitCommits(['Second'], {cwd});
-  await gitTagVersion('v2.0.x', undefined, {cwd});
-  await gitCommits(['Third'], {cwd});
-  await gitTagVersion('v3.0', undefined, {cwd});
-
-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
+test('Return empty object if no valid tag is found', t => {
+  const result = getLastRelease({
+    branch: {
+      name: 'master',
+      tags: [{version: '3.0.0-beta.1', gitTag: 'v3.0.0-beta.1@beta', gitHead: '111'}],
+      type: 'release',
+    },
+    options: {tagFormat: `v\${version}`},
+    logger: t.context.logger,
+  });

  t.deepEqual(result, {});
-  t.is(t.context.log.args[0][0], 'No git tag version found');
+  t.deepEqual(t.context.log.args[0][0], 'No git tag version found on branch master');
 });

-test('Return empty object if no valid tag is found in history', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  await gitCommits(['First'], {cwd});
-  await gitCheckout('other-branch', true, {cwd});
-  await gitCommits(['Second'], {cwd});
-  await gitTagVersion('v1.0.0', undefined, {cwd});
-  await gitTagVersion('v2.0.0', undefined, {cwd});
-  await gitTagVersion('v3.0.0', undefined, {cwd});
-  await gitCheckout('master', false, {cwd});
+test('Get the highest non-prerelease valid tag before a certain version', t => {
+  const result = getLastRelease(
+    {
+      branch: {
+        name: 'master',
+        channel: undefined,
+        tags: [
+          {version: '2.0.0', gitTag: 'v2.0.0', gitHead: '333'},
+          {version: '1.0.0', gitTag: 'v1.0.0', gitHead: '111'},
+          {version: '2.0.0-beta.1', gitTag: 'v2.0.0-beta.1@beta', gitHead: '222'},
+          {version: '2.1.0', gitTag: 'v2.1.0', gitHead: '444'},
+          {version: '2.1.1', gitTag: 'v2.1.1', gitHead: '555'},
+        ],
+        type: 'release',
+      },
+      options: {tagFormat: `v\${version}`},
+      logger: t.context.logger,
+    },
+    {before: '2.1.0'}
+  );

-  const result = await getLastRelease({cwd, options: {tagFormat: `v\${version}`}, logger: t.context.logger});
-
-  t.deepEqual(result, {});
-  t.is(t.context.log.args[0][0], 'No git tag version found');
-});
-
-test('Get the highest valid tag corresponding to the "tagFormat"', async t => {
-  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd} = await gitRepo();
-  // Create some commits and tags
-  const [{hash: gitHead}] = await gitCommits(['First'], {cwd});
-
-  await gitTagVersion('1.0.0', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `\${version}`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '1.0.0',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('foo-1.0.0-bar', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `foo-\${version}-bar`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: 'foo-1.0.0-bar',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('foo-v1.0.0-bar', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `foo-v\${version}-bar`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: 'foo-v1.0.0-bar',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('(.+)/1.0.0/(a-z)', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `(.+)/\${version}/(a-z)`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '(.+)/1.0.0/(a-z)',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('2.0.0-1.0.0-bar.1', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `2.0.0-\${version}-bar.1`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '2.0.0-1.0.0-bar.1',
-    version: '1.0.0',
-  });
-
-  await gitTagVersion('3.0.0-bar.1', undefined, {cwd});
-  t.deepEqual(await getLastRelease({cwd, options: {tagFormat: `\${version}-bar.1`}, logger: t.context.logger}), {
-    gitHead,
-    gitTag: '3.0.0-bar.1',
-    version: '3.0.0',
-  });
+  t.deepEqual(result, {version: '2.0.0', gitTag: 'v2.0.0', name: 'v2.0.0', gitHead: '333', channel: undefined});
+  t.deepEqual(t.context.log.args[0][0], 'Found git tag v2.0.0 associated with version 2.0.0 on branch master');
 });
@@ -9,33 +9,127 @@ test.beforeEach(t => {
 });

 test('Increase version for patch release', t => {
-  const version = getNextVersion({
-    nextRelease: {type: 'patch'},
-    lastRelease: {version: '1.0.0'},
-    logger: t.context.logger,
-  });
-  t.is(version, '1.0.1');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'patch'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.0.1'
+  );
 });

 test('Increase version for minor release', t => {
-  const version = getNextVersion({
-    nextRelease: {type: 'minor'},
-    lastRelease: {version: '1.0.0'},
-    logger: t.context.logger,
-  });
-  t.is(version, '1.1.0');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.1.0'
+  );
 });

 test('Increase version for major release', t => {
-  const version = getNextVersion({
-    nextRelease: {type: 'major'},
-    lastRelease: {version: '1.0.0'},
-    logger: t.context.logger,
-  });
-  t.is(version, '2.0.0');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'major'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '2.0.0'
+  );
 });

 test('Return 1.0.0 if there is no previous release', t => {
-  const version = getNextVersion({nextRelease: {type: 'minor'}, lastRelease: {}, logger: t.context.logger});
-  t.is(version, '1.0.0');
+  t.is(
+    getNextVersion({
+      branch: {name: 'master', type: 'release'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {},
+      logger: t.context.logger,
+    }),
+    '1.0.0'
+  );
+});
+
+test('Increase version for patch release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'patch'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.0.1-beta.1'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'patch'},
+      lastRelease: {version: '1.0.0-beta.1'},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.2'
+  );
+});
+
+test('Increase version for minor release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '1.1.0-beta.1'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {version: '1.0.0-beta.1'},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.2'
+  );
+});
+
+test('Increase version for major release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'major'},
+      lastRelease: {version: '1.0.0'},
+      logger: t.context.logger,
+    }),
+    '2.0.0-beta.1'
+  );
+
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'major'},
+      lastRelease: {version: '1.0.0-beta.1'},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.2'
+  );
+});
+
+test('Return 1.0.0 if there is no previous release on prerelease branch', t => {
+  t.is(
+    getNextVersion({
+      branch: {name: 'beta', type: 'prerelease', prerelease: 'beta'},
+      nextRelease: {type: 'minor'},
+      lastRelease: {},
+      logger: t.context.logger,
+    }),
+    '1.0.0-beta.1'
+  );
 });
@@ -0,0 +1,258 @@
+import test from 'ava';
+import {stub} from 'sinon';
+import getReleasesToAdd from '../lib/get-releases-to-add';
+
+test.beforeEach(t => {
+  // Stub the logger functions
+  t.context.log = stub();
+  t.context.logger = {log: t.context.log};
+});
+
+test('Return versions merged from release to maintenance branch', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: '1.x',
+      channel: '1.x',
+      tags: [
+        {gitTag: 'v1.0.0@1.x', version: '1.0.0', channel: '1.x', gitHead: '111'},
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.1.0', version: '1.1.0', gitHead: '222'},
+        {gitTag: 'v1.1.1', version: '1.1.1', gitHead: '333'},
+      ],
+    },
+    branches: [{name: '1.x', channel: '1.x'}, {name: 'master'}],
+    options: {tagFormat: `v\${version}`},
+    logger: t.context.logger,
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '1.0.0', channel: '1.x', gitTag: 'v1.0.0@1.x', name: 'v1.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: undefined,
+        gitTag: 'v1.1.0',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: '1.x',
+        gitTag: 'v1.1.0@1.x',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+    },
+    {
+      lastRelease: {version: '1.1.0', channel: undefined, gitTag: 'v1.1.0', name: 'v1.1.0', gitHead: '222'},
+      currentRelease: {
+        type: 'patch',
+        version: '1.1.1',
+        channel: undefined,
+        gitTag: 'v1.1.1',
+        name: 'v1.1.1',
+        gitHead: '333',
+      },
+      nextRelease: {
+        type: 'patch',
+        version: '1.1.1',
+        channel: '1.x',
+        gitTag: 'v1.1.1@1.x',
+        name: 'v1.1.1',
+        gitHead: '333',
+      },
+    },
+  ]);
+});
+
+test('Return versions merged from future branch to release branch', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'},
+        {gitTag: 'v1.1.0@next', version: '1.1.0', channel: 'next', gitHead: '222'},
+        {gitTag: 'v2.0.0@next-major', version: '2.0.0', channel: 'next-major', gitHead: '333'},
+      ],
+    },
+    branches: [{name: 'master'}, {name: 'next', channel: 'next'}, {name: 'next-major', channel: 'next-major'}],
+    options: {tagFormat: `v\${version}`},
+    logger: t.context.logger,
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '1.0.0', channel: undefined, gitTag: 'v1.0.0', name: 'v1.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: 'next',
+        gitTag: 'v1.1.0@next',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: undefined,
+        gitTag: 'v1.1.0',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+    },
+    {
+      lastRelease: {version: '1.1.0', gitTag: 'v1.1.0@next', name: 'v1.1.0', gitHead: '222', channel: 'next'},
+      currentRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: 'next-major',
+        gitTag: 'v2.0.0@next-major',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+      nextRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: undefined,
+        gitTag: 'v2.0.0',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+    },
+  ]);
+});
+
+test('Return releases sorted by ascending order', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      tags: [
+        {gitTag: 'v2.0.0@next-major', version: '2.0.0', channel: 'next-major', gitHead: '333'},
+        {gitTag: 'v1.1.0@next', version: '1.1.0', channel: 'next', gitHead: '222'},
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'},
+      ],
+    },
+    branches: [{name: 'master'}, {name: 'next', channel: 'next'}, {name: 'next-major', channel: 'next-major'}],
+    options: {tagFormat: `v\${version}`},
+    logger: t.context.logger,
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '1.0.0', channel: undefined, gitTag: 'v1.0.0', name: 'v1.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: 'next',
+        gitTag: 'v1.1.0@next',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: undefined,
+        gitTag: 'v1.1.0',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+    },
+    {
+      lastRelease: {version: '1.1.0', gitTag: 'v1.1.0@next', name: 'v1.1.0', gitHead: '222', channel: 'next'},
+      currentRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: 'next-major',
+        gitTag: 'v2.0.0@next-major',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+      nextRelease: {
+        type: 'major',
+        version: '2.0.0',
+        channel: undefined,
+        gitTag: 'v2.0.0',
+        name: 'v2.0.0',
+        gitHead: '333',
+      },
+    },
+  ]);
+});
+
+test('no lastRelease', t => {
+  const result = getReleasesToAdd({
+    branch: {name: 'master', tags: [{gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'}]},
+    branches: [{name: 'master'}, {name: 'next', channel: 'next'}],
+    options: {tagFormat: `v\${version}`},
+    logger: t.context.logger,
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {},
+      currentRelease: {
+        type: 'major',
+        version: '1.0.0',
+        channel: 'next',
+        gitTag: 'v1.0.0@next',
+        name: 'v1.0.0',
+        gitHead: '111',
+      },
+      nextRelease: {
+        type: 'major',
+        version: '1.0.0',
+        channel: undefined,
+        gitTag: 'v1.0.0',
+        name: 'v1.0.0',
+        gitHead: '111',
+      },
+    },
+  ]);
+});
+
+test('Ignore pre-release versions', t => {
+  const result = getReleasesToAdd({
+    branch: {
+      name: 'master',
+      tags: [
+        {gitTag: 'v1.0.0', version: '1.0.0', gitHead: '111'},
+        {gitTag: 'v1.0.0@next', version: '1.0.0', channel: 'next', gitHead: '111'},
+        {gitTag: 'v1.1.0@next', version: '1.1.0', channel: 'next', gitHead: '222'},
+        {gitTag: 'v2.0.0-alpha.1@alpha', version: '2.0.0', channel: 'alpha', gitHead: '333'},
+      ],
+    },
+    branches: [
+      {name: 'master'},
+      {name: 'next', channel: 'next'},
+      {name: 'alpha', type: 'prerelease', channel: 'alpha'},
+    ],
+    options: {tagFormat: `v\${version}`},
+    logger: t.context.logger,
+  });
+
+  t.deepEqual(result, [
+    {
+      lastRelease: {version: '1.0.0', channel: undefined, gitTag: 'v1.0.0', name: 'v1.0.0', gitHead: '111'},
+      currentRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: 'next',
+        gitTag: 'v1.1.0@next',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+      nextRelease: {
+        type: 'minor',
+        version: '1.1.0',
+        channel: undefined,
+        gitTag: 'v1.1.0',
+        name: 'v1.1.0',
+        gitHead: '222',
+      },
+    },
+  ]);
+});
@@ -1,14 +1,16 @@
 import test from 'ava';
 import tempy from 'tempy';
 import {
-  gitTagHead,
+  getTagHead,
  isRefInHistory,
+  isRefExists,
  fetch,
-  gitHead,
+  getGitHead,
  repoUrl,
  tag,
  push,
-  gitTags,
+  getTags,
+  getBranches,
  isGitRepo,
  verifyTagName,
  isBranchUpToDate,
@@ -33,7 +35,7 @@ test('Get the last commit sha', async t => {
  // Add commits to the master branch
  const commits = await gitCommits(['First'], {cwd});

-  const result = await gitHead({cwd});
+  const result = await getGitHead({cwd});

  t.is(result, commits[0].hash);
 });
@@ -42,7 +44,7 @@ test('Throw error if the last commit sha cannot be found', async t => {
  // Create a git repository, set the current working directory at the root of the repo
  const {cwd} = await gitRepo();

-  await t.throws(gitHead({cwd}), Error);
+  await t.throws(getGitHead({cwd}), Error);
 });

 test('Unshallow and fetch repository', async t => {
@@ -56,7 +58,7 @@ test('Unshallow and fetch repository', async t => {
  // Verify the shallow clone contains only one commit
  t.is((await gitGetCommits(undefined, {cwd})).length, 1);

-  await fetch(repositoryUrl, {cwd});
+  await fetch('master', {cwd});

  // Verify the shallow clone contains all the commits
  t.is((await gitGetCommits(undefined, {cwd})).length, 2);
@@ -64,10 +66,15 @@ test('Unshallow and fetch repository', async t => {

 test('Do not throw error when unshallow a complete repository', async t => {
  // Create a git repository, set the current working directory at the root of the repo
-  const {cwd, repositoryUrl} = await gitRepo();
-  // Add commits to the master branch
+  const {cwd, repositoryUrl} = await gitRepo(true);
  await gitCommits(['First'], {cwd});
-  await t.notThrows(fetch(repositoryUrl, {cwd}));
+  await gitPush(repositoryUrl, 'master', {cwd});
+  await gitCheckout('second-branch', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitPush(repositoryUrl, 'second-branch', {cwd});
+
+  await t.notThrows(fetch('master', {cwd}));
+  await t.notThrows(fetch('second-branch', {cwd}));
 });

 test('Fetch all tags on a detached head repository', async t => {
@@ -82,9 +89,9 @@ test('Fetch all tags on a detached head repository', async t => {
  await gitPush(repositoryUrl, 'master', {cwd});
  cwd = await gitDetachedHead(repositoryUrl, commit.hash);

-  await fetch(repositoryUrl, {cwd});
+  await fetch('master', {cwd});

-  t.deepEqual((await gitTags({cwd})).sort(), ['v1.0.0', 'v1.0.1', 'v1.1.0'].sort());
+  t.deepEqual((await getTags({cwd})).sort(), ['v1.0.0', 'v1.0.1', 'v1.1.0'].sort());
 });

 test('Verify if the commit `sha` is in the direct history of the current branch', async t => {
@@ -98,9 +105,39 @@ test('Verify if the commit `sha` is in the direct history of the current branch'
  const otherCommits = await gitCommits(['Second'], {cwd});
  await gitCheckout('master', false, {cwd});

-  t.true(await isRefInHistory(commits[0].hash, {cwd}));
-  t.falsy(await isRefInHistory(otherCommits[0].hash, {cwd}));
-  await t.throws(isRefInHistory('non-existant-sha', {cwd}));
+  t.true(await isRefInHistory(commits[0].hash, 'master', false, {cwd}));
+  t.falsy(await isRefInHistory(otherCommits[0].hash, 'master', false, {cwd}));
+  t.falsy(await isRefInHistory(otherCommits[0].hash, 'missing-branch', false, {cwd}));
+  await t.throws(isRefInHistory('non-existant-sha', 'master', false, {cwd}));
+});
+
+test('Verify if a branch exists', async t => {
+  // Create a git repository, set the current working directory at the root of the repo
+  const {cwd} = await gitRepo();
+  // Add commits to the master branch
+  await gitCommits(['First'], {cwd});
+  // Create the new branch 'other-branch' from master
+  await gitCheckout('other-branch', true, {cwd});
+  // Add commits to the 'other-branch' branch
+  await gitCommits(['Second'], {cwd});
+
+  t.true(await isRefExists('master', {cwd}));
+  t.true(await isRefExists('other-branch', {cwd}));
+  t.falsy(await isRefExists('next', {cwd}));
+});
+
+test('Get all branches', async t => {
+  const {cwd, repositoryUrl} = await gitRepo(true);
+  await gitCommits(['First'], {cwd});
+  await gitPush(repositoryUrl, 'master', {cwd});
+  await gitCheckout('second-branch', true, {cwd});
+  await gitCommits(['Second'], {cwd});
+  await gitPush(repositoryUrl, 'second-branch', {cwd});
+  await gitCheckout('third-branch', true, {cwd});
+  await gitCommits(['Third'], {cwd});
+  await gitPush(repositoryUrl, 'third-branch', {cwd});
+
+  t.deepEqual((await getBranches({cwd})).sort(), ['master', 'second-branch', 'third-branch'].sort());
 });

 test('Get the commit sha for a given tag or falsy if the tag does not exists', async t => {
@@ -111,8 +148,8 @@ test('Get the commit sha for a given tag or falsy if the tag does not exists', a
  // Create the tag corresponding to version 1.0.0
  await gitTagVersion('v1.0.0', undefined, {cwd});

-  t.is(await gitTagHead('v1.0.0', {cwd}), commits[0].hash);
-  t.falsy(await gitTagHead('missing_tag', {cwd}));
+  t.is(await getTagHead('v1.0.0', {cwd}), commits[0].hash);
+  t.falsy(await getTagHead('missing_tag', {cwd}));
 });

 test('Return git remote repository url from config', async t => {
@@ -146,17 +183,31 @@ test('Add tag on head commit', async t => {
  const {cwd} = await gitRepo();
  const commits = await gitCommits(['Test commit'], {cwd});

-  await tag('tag_name', {cwd});
+  await tag('tag_name', 'HEAD', {cwd});

  await t.is(await gitCommitTag(commits[0].hash, {cwd}), 'tag_name');
 });

-test('Push tag and commit to remote repository', async t => {
+test('Push tag to remote repository', async t => {
  // Create a git repository with a remote, set the current working directory at the root of the repo
  const {cwd, repositoryUrl} = await gitRepo(true);
  const commits = await gitCommits(['Test commit'], {cwd});

-  await tag('tag_name', {cwd});
+  await tag('tag_name', 'HEAD', {cwd});
+  await push(repositoryUrl, 'master', {cwd});
+
+  t.is(await gitRemoteTagHead(repositoryUrl, 'tag_name', {cwd}), commits[0].hash);
+});
+
+test('Push tag to remote repository with remote branch ahead', async t => {
+  const {cwd, repositoryUrl} = await gitRepo(true);
+  const commits = await gitCommits(['First'], {cwd});
+  await gitPush(repositoryUrl, 'master', {cwd});
+  const tmpRepo = await gitShallowClone(repositoryUrl);
+  await gitCommits(['Second'], {cwd: tmpRepo});
+  await gitPush('origin', 'master', {cwd: tmpRepo});
+
+  await tag('tag_name', 'HEAD', {cwd});
  await push(repositoryUrl, 'master', {cwd});

  t.is(await gitRemoteTagHead(repositoryUrl, 'tag_name', {cwd}), commits[0].hash);
@@ -192,7 +243,7 @@ test('Return falsy for invalid tag names', async t => {
 test('Throws error if obtaining the tags fails', async t => {
  const cwd = tempy.directory();

-  await t.throws(gitTags({cwd}));
+  await t.throws(getTags({cwd}));
 });

 test('Return "true" if repository is up to date', async t => {
@@ -204,19 +255,18 @@ test('Return "true" if repository is up to date', async t => {
 });

 test('Return falsy if repository is not up to date', async t => {
-  let {cwd, repositoryUrl} = await gitRepo(true);
-  const repoDir = cwd;
+  const {cwd, repositoryUrl} = await gitRepo(true);
  await gitCommits(['First'], {cwd});
  await gitCommits(['Second'], {cwd});
  await gitPush(repositoryUrl, 'master', {cwd});

  t.true(await isBranchUpToDate('master', {cwd}));

-  cwd = await gitShallowClone(repositoryUrl);
-  await gitCommits(['Third'], {cwd});
-  await gitPush('origin', 'master', {cwd});
+  const tmpRepo = await gitShallowClone(repositoryUrl);
+  await gitCommits(['Third'], {cwd: tmpRepo});
+  await gitPush('origin', 'master', {cwd: tmpRepo});

-  t.falsy(await isBranchUpToDate('master', {cwd: repoDir}));
+  t.falsy(await isBranchUpToDate('master', {cwd}));
 });

 test('Return "true" if local repository is ahead', async t => {
@@ -1,7 +1,7 @@
 import tempy from 'tempy';
 import execa from 'execa';
 import fileUrl from 'file-url';
-import pReduce from 'p-reduce';
+import pEachSeries from 'p-each-series';
 import gitLogParser from 'git-log-parser';
 import getStream from 'get-stream';

@@ -26,7 +26,7 @@ import getStream from 'get-stream';
 export async function gitRepo(withRemote, branch = 'master') {
  let cwd = tempy.directory();

-  await execa('git', ['init'].concat(withRemote ? ['--bare'] : []), {cwd});
+  await execa('git', ['init', ...(withRemote ? ['--bare'] : [])], {cwd});

  const repositoryUrl = fileUrl(cwd);
  if (withRemote) {
@@ -69,7 +69,7 @@ export async function initBareRepo(repositoryUrl, branch = 'master') {
 * @returns {Array<Commit>} The created commits, in reverse order (to match `git log` order).
 */
 export async function gitCommits(messages, execaOpts) {
-  await pReduce(messages, (_, message) =>
+  await pEachSeries(messages, message =>
    execa.stdout('git', ['commit', '-m', message, '--allow-empty', '--no-gpg-sign'], execaOpts)
  );
  return (await gitGetCommits(undefined, execaOpts)).slice(0, messages.length);
@@ -225,3 +225,46 @@ export function gitCommitTag(gitHead, execaOpts) {
 export async function gitPush(repositoryUrl = 'origin', branch = 'master', execaOpts) {
  await execa('git', ['push', '--tags', repositoryUrl, `HEAD:${branch}`], execaOpts);
 }
+
+/**
+ * Merge a branch into the current one with `git merge`.
+ *
+ * @param {String} ref The ref to merge.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ */
+export async function merge(ref, execaOpts) {
+  await execa('git', ['merge', '--no-ff', ref], execaOpts);
+}
+
+/**
+ * Merge a branch into the current one with `git merge --ff`.
+ *
+ * @param {String} ref The ref to merge.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ */
+export async function mergeFf(ref, execaOpts) {
+  await execa('git', ['merge', '--ff', ref], execaOpts);
+}
+
+/**
+ * Merge a branch into the current one with `git rebase`.
+ *
+ * @param {String} ref The ref to merge.
+ * @param {Object} [execaOpts] Options to pass to `execa`.
+ */
+export async function rebase(ref, execaOpts) {
+  await execa('git', ['rebase', ref], execaOpts);
+}
+
+export async function changeAuthor(sha, execaOpts) {
+  await execa(
+    'git',
+    [
+      'filter-branch',
+      '-f',
+      '--env-filter',
+      `if [[ "$GIT_COMMIT" = "${sha}" ]]; then export GIT_COMMITTER_NAME="New Author" GIT_COMMITTER_EMAIL="author@test.com"; fi`,
+    ],
+    execaOpts
+  );
+}
@@ -0,0 +1,5 @@
+import execa from 'execa';
+
+export async function npmView(packageName, env) {
+  return JSON.parse(await execa.stdout('npm', ['view', packageName, '--json'], {env}));
+}
@@ -5,8 +5,19 @@ import {escapeRegExp} from 'lodash';
 import {writeJson, readJson} from 'fs-extra';
 import execa from 'execa';
 import {WritableStreamBuffer} from 'stream-buffers';
+import delay from 'delay';
 import {SECRET_REPLACEMENT} from '../lib/definitions/constants';
-import {gitHead as getGitHead, gitTagHead, gitRepo, gitCommits, gitRemoteTagHead, gitPush} from './helpers/git-utils';
+import {
+  gitHead,
+  gitTagHead,
+  gitRepo,
+  gitCommits,
+  gitRemoteTagHead,
+  gitPush,
+  gitCheckout,
+  merge,
+} from './helpers/git-utils';
+import {npmView} from './helpers/npm-utils';
 import gitbox from './helpers/gitbox';
 import mockServer from './helpers/mockserver';
 import npmRegistry from './helpers/npm-registry';
@@ -58,7 +69,7 @@ test('Release patch, minor and major versions', async t => {
    version: '0.0.0-dev',
    repository: {url: repositoryUrl},
    publishConfig: {registry: npmRegistry.url},
-    release: {success: false, fail: false},
+    release: {branches: ['master', 'next'], success: false, fail: false},
  });
  // Create a npm-shrinkwrap.json file
  await execa('npm', ['shrinkwrap'], {env: testEnv, cwd});
@@ -86,7 +97,7 @@ test('Release patch, minor and major versions', async t => {
  let createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -105,15 +116,14 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  let [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
-  let gitHead = await getGitHead({cwd});
+  let {
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv);
+  let head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, gitHead);
-  t.is(await gitTagHead(`v${version}`, {cwd}), gitHead);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), gitHead);
-  t.log(`+ released ${releasedVersion} with gitHead ${releasedGitHead}`);
+  t.is(await gitTagHead(`v${version}`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
+  t.log(`+ released ${releasedVersion}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
@@ -128,7 +138,7 @@ test('Release patch, minor and major versions', async t => {
  createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -147,15 +157,14 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
-  gitHead = await getGitHead({cwd});
+  ({
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv));
+  head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, gitHead);
-  t.is(await gitTagHead(`v${version}`, {cwd}), gitHead);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), gitHead);
-  t.log(`+ released ${releasedVersion} with gitHead ${releasedGitHead}`);
+  t.is(await gitTagHead(`v${version}`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
+  t.log(`+ released ${releasedVersion}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
@@ -170,7 +179,7 @@ test('Release patch, minor and major versions', async t => {
  createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -189,20 +198,19 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
-  gitHead = await getGitHead({cwd});
+  ({
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv));
+  head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, gitHead);
-  t.is(await gitTagHead(`v${version}`, {cwd}), gitHead);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), gitHead);
-  t.log(`+ released ${releasedVersion} with gitHead ${releasedGitHead}`);
+  t.is(await gitTagHead(`v${version}`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
+  t.log(`+ released ${releasedVersion}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);

-  /* Major release */
+  /* Major release on next */
  version = '2.0.0';
  verifyMock = await mockServer.mock(
    `/repos/${owner}/${packageName}`,
@@ -212,16 +220,18 @@ test('Release patch, minor and major versions', async t => {
  createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}@next`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
  );

-  t.log('Commit a breaking change');
+  t.log('Commit a breaking change on next');
+  await gitCheckout('next', true, {cwd});
+  await gitPush('origin', 'next', {cwd});
  await gitCommits(['feat: foo\n\n BREAKING CHANGE: bar'], {cwd});
  t.log('$ semantic-release');
-  ({stdout, code} = await execa(cli, [], {env, cwd}));
+  ({stdout, code} = await execa(cli, [], {env: {...env, TRAVIS_BRANCH: 'next'}, cwd}));
  t.regex(stdout, new RegExp(`Published GitHub release: release-url/${version}`));
  t.regex(stdout, new RegExp(`Publishing version ${version} to npm registry`));
  t.is(code, 0);
@@ -231,18 +241,67 @@ test('Release patch, minor and major versions', async t => {
  t.is((await readJson(path.resolve(cwd, 'npm-shrinkwrap.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
-  gitHead = await getGitHead({cwd});
+  ({
+    'dist-tags': {next: releasedVersion},
+  } = await npmView(packageName, testEnv));
+  head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, gitHead);
-  t.is(await gitTagHead(`v${version}`, {cwd}), gitHead);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), gitHead);
-  t.log(`+ released ${releasedVersion} with gitHead ${releasedGitHead}`);
+  t.is(await gitTagHead(`v${version}@next`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}@next`, {cwd}), head);
+  t.log(`+ released ${releasedVersion} on @next`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
+
+  /* Merge next into master */
+  version = '2.0.0';
+  const releaseId = 1;
+  verifyMock = await mockServer.mock(
+    `/repos/${owner}/${packageName}`,
+    {headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}]},
+    {body: {permissions: {push: true}}, method: 'GET'}
+  );
+  const getReleaseMock = await mockServer.mock(
+    `/repos/${owner}/${packageName}/releases/tags/v2.0.0@next`,
+    {headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}]},
+    {body: {id: releaseId}, method: 'GET'}
+  );
+  const updateReleaseMock = await mockServer.mock(
+    `/repos/${owner}/${packageName}/releases/${releaseId}`,
+    {
+      body: {tag_name: `v${version}`, name: `v${version}`, prerelease: false},
+      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
+    },
+    {body: {html_url: `release-url/${version}`}, method: 'PATCH'}
+  );
+
+  t.log('Merge next into master');
+  await gitCheckout('master', false, {cwd});
+  await merge('next', {cwd});
+  await gitPush('origin', 'master', {cwd});
+  t.log('$ semantic-release');
+  ({stdout, code} = await execa(cli, [], {env, cwd}));
+  t.regex(stdout, new RegExp(`Updated GitHub release: release-url/${version}`));
+  t.regex(stdout, new RegExp(`Adding version ${version} to npm registry on dist-tag latest`));
+  t.is(code, 0);
+
+  // Wait for 3s as the change of dist-tag takes time to be reflected in the registry
+  await delay(3000);
+  // Retrieve the published package from the registry and check version and gitHead
+  ({
+    'dist-tags': {latest: releasedVersion},
+  } = await npmView(packageName, testEnv));
+  t.is(releasedVersion, version);
+  t.is(await gitTagHead(`v${version}`, {cwd}), await gitTagHead(`v${version}@next`, {cwd}));
+  t.is(
+    await gitRemoteTagHead(authUrl, `v${version}`, {cwd}),
+    await gitRemoteTagHead(authUrl, `v${version}@next`, {cwd})
+  );
+  t.log(`+ added ${releasedVersion}`);
+
+  await mockServer.verify(verifyMock);
+  await mockServer.verify(getReleaseMock);
+  await mockServer.verify(updateReleaseMock);
 });

 test('Exit with 1 if a plugin is not found', async t => {
@@ -366,7 +425,7 @@ test('Allow local releases with "noCi" option', async t => {
  const createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -384,16 +443,14 @@ test('Allow local releases with "noCi" option', async t => {
  t.is((await readJson(path.resolve(cwd, 'package.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  const [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
+  const {version: releasedVersion, gitHead: releasedGitHead} = await npmView(packageName, testEnv);

-  const gitHead = await getGitHead({cwd});
+  const head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, gitHead);
-  t.is(await gitTagHead(`v${version}`, {cwd}), gitHead);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), gitHead);
-  t.log(`+ released ${releasedVersion} with gitHead ${releasedGitHead}`);
+  t.is(releasedGitHead, head);
+  t.is(await gitTagHead(`v${version}`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
+  t.log(`+ released ${releasedVersion} with head ${releasedGitHead}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
@@ -439,15 +496,13 @@ test('Pass options via CLI arguments', async t => {
  t.is((await readJson(path.resolve(cwd, 'package.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  const [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
-  const gitHead = await getGitHead({cwd});
+  const {version: releasedVersion, gitHead: releasedGitHead} = await npmView(packageName, testEnv);
+  const head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, gitHead);
-  t.is(await gitTagHead(`v${version}`, {cwd}), gitHead);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), gitHead);
-  t.log(`+ released ${releasedVersion} with gitHead ${releasedGitHead}`);
+  t.is(releasedGitHead, head);
+  t.is(await gitTagHead(`v${version}`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
+  t.log(`+ released ${releasedVersion} with head ${releasedGitHead}`);
 });

 test('Run via JS API', async t => {
@@ -482,7 +537,7 @@ test('Run via JS API', async t => {
  const createReleaseMock = await mockServer.mock(
    `/repos/${owner}/${packageName}/releases`,
    {
-      body: {tag_name: `v${version}`, target_commitish: 'master', name: `v${version}`},
+      body: {tag_name: `v${version}`, name: `v${version}`},
      headers: [{name: 'Authorization', values: [`token ${env.GH_TOKEN}`]}],
    },
    {body: {html_url: `release-url/${version}`}}
@@ -497,15 +552,13 @@ test('Run via JS API', async t => {
  t.is((await readJson(path.resolve(cwd, 'package.json'))).version, version);

  // Retrieve the published package from the registry and check version and gitHead
-  const [, releasedVersion, releasedGitHead] = /^version = '(.+)'\s+gitHead = '(.+)'$/.exec(
-    (await execa('npm', ['show', packageName, 'version', 'gitHead'], {env: testEnv, cwd})).stdout
-  );
-  const gitHead = await getGitHead({cwd});
+  const {version: releasedVersion, gitHead: releasedGitHead} = await npmView(packageName, testEnv);
+  const head = await gitHead({cwd});
  t.is(releasedVersion, version);
-  t.is(releasedGitHead, gitHead);
-  t.is(await gitTagHead(`v${version}`, {cwd}), gitHead);
-  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), gitHead);
-  t.log(`+ released ${releasedVersion} with gitHead ${releasedGitHead}`);
+  t.is(releasedGitHead, head);
+  t.is(await gitTagHead(`v${version}`, {cwd}), head);
+  t.is(await gitRemoteTagHead(authUrl, `v${version}`, {cwd}), head);
+  t.log(`+ released ${releasedVersion} with head ${releasedGitHead}`);

  await mockServer.verify(verifyMock);
  await mockServer.verify(createReleaseMock);
@@ -62,7 +62,7 @@ test('Wrap plugin in a function that add the "pluginName" to the error"', async
    './plugin-error': './test/fixtures',
  });

-  const error = await t.throws(plugin());
+  const error = await t.throws(plugin({options: {}}));

  t.is(error.pluginName, './plugin-error');
 });
@@ -72,7 +72,7 @@ test('Wrap plugin in a function that add the "pluginName" to multiple errors"',
    './plugin-errors': './test/fixtures',
  });

-  const errors = [...(await t.throws(plugin()))];
+  const errors = [...(await t.throws(plugin({options: {}})))];
  for (const error of errors) {
    t.is(error.pluginName, './plugin-errors');
  }
@@ -107,7 +107,7 @@ test('Wrap "analyzeCommits" plugin in a function that validate the output of the
    {}
  );

-  const error = await t.throws(plugin());
+  const error = await t.throws(plugin({options: {}}));

  t.is(error.code, 'EANALYZECOMMITSOUTPUT');
  t.is(error.name, 'SemanticReleaseError');
@@ -125,7 +125,7 @@ test('Wrap "generateNotes" plugin in a function that validate the output of the
    {}
  );

-  const error = await t.throws(plugin());
+  const error = await t.throws(plugin({options: {}}));

  t.is(error.code, 'EGENERATENOTESOUTPUT');
  t.is(error.name, 'SemanticReleaseError');
@@ -143,7 +143,7 @@ test('Wrap "publish" plugin in a function that validate the output of the plugin
    {}
  );

-  const error = await t.throws(plugin());
+  const error = await t.throws(plugin({options: {}}));

  t.is(error.code, 'EPUBLISHOUTPUT');
  t.is(error.name, 'SemanticReleaseError');
@@ -152,12 +152,30 @@ test('Wrap "publish" plugin in a function that validate the output of the plugin
  t.regex(error.details, /2/);
 });

+test('Wrap "addChannel" plugin in a function that validate the output of the plugin', async t => {
+  const addChannel = stub().resolves(2);
+  const plugin = normalize(
+    {cwd, options: {}, stderr: t.context.stderr, logger: t.context.logger},
+    'addChannel',
+    addChannel,
+    {}
+  );
+
+  const error = await t.throws(plugin({options: {}}));
+
+  t.is(error.code, 'EADDCHANNELOUTPUT');
+  t.is(error.name, 'SemanticReleaseError');
+  t.truthy(error.message);
+  t.truthy(error.details);
+  t.regex(error.details, /2/);
+});
+
 test('Plugin is called with "pluginConfig" (with object definition) and input', async t => {
  const pluginFunction = stub().resolves();
  const pluginConf = {path: pluginFunction, conf: 'confValue'};
  const options = {global: 'globalValue'};
  const plugin = normalize({cwd, options, logger: t.context.logger}, '', pluginConf, {});
-  await plugin({param: 'param'});
+  await plugin({options: {}, param: 'param'});

  t.true(
    pluginFunction.calledWithMatch(
@@ -172,7 +190,7 @@ test('Plugin is called with "pluginConfig" (with array definition) and input', a
  const pluginConf = [pluginFunction, {conf: 'confValue'}];
  const options = {global: 'globalValue'};
  const plugin = normalize({cwd, options, logger: t.context.logger}, '', pluginConf, {});
-  await plugin({param: 'param'});
+  await plugin({options: {}, param: 'param'});

  t.true(
    pluginFunction.calledWithMatch(
@@ -189,7 +207,7 @@ test('Prevent plugins to modify "pluginConfig"', async t => {
  const pluginConf = {path: pluginFunction, conf: {subConf: 'originalConf'}};
  const options = {globalConf: {globalSubConf: 'originalGlobalConf'}};
  const plugin = normalize({cwd, options, logger: t.context.logger}, '', pluginConf, {});
-  await plugin();
+  await plugin({options: {}});

  t.is(pluginConf.conf.subConf, 'originalConf');
  t.is(options.globalConf.globalSubConf, 'originalGlobalConf');
@@ -199,7 +217,7 @@ test('Prevent plugins to modify its input', async t => {
  const pluginFunction = stub().callsFake((pluginConfig, options) => {
    options.param.subParam = 'otherParam';
  });
-  const input = {param: {subParam: 'originalSubParam'}};
+  const input = {param: {subParam: 'originalSubParam'}, options: {}};
  const plugin = normalize({cwd, options: {}, logger: t.context.logger}, '', pluginFunction, {});
  await plugin(input);

@@ -220,7 +238,7 @@ test('Always pass a defined "pluginConfig" for plugin defined with string', asyn
    './test/fixtures/plugin-result-config',
    {}
  );
-  const pluginResult = await plugin();
+  const pluginResult = await plugin({options: {}});

  t.deepEqual(pluginResult.pluginConfig, {});
 });
@@ -233,7 +251,7 @@ test('Always pass a defined "pluginConfig" for plugin defined with path', async
    {path: './test/fixtures/plugin-result-config'},
    {}
  );
-  const pluginResult = await plugin();
+  const pluginResult = await plugin({options: {}});

  t.deepEqual(pluginResult.pluginConfig, {});
 });
@@ -63,14 +63,14 @@ test('Export plugins based on "plugins" config (array)', async t => {
    {}
  );

-  await plugins.verifyConditions({});
+  await plugins.verifyConditions({options: {}});
  t.true(plugin1.verifyConditions.calledOnce);
  t.true(plugin2.verifyConditions.calledOnce);

-  await plugins.publish({});
+  await plugins.publish({options: {}});
  t.true(plugin1.publish.calledOnce);

-  await plugins.verifyRelease({});
+  await plugins.verifyRelease({options: {}});
  t.true(plugin2.verifyRelease.notCalled);

  // Verify the module returns a function for each plugin
@@ -88,10 +88,10 @@ test('Export plugins based on "plugins" config (single definition)', async t =>
  const plugin1 = {verifyConditions: stub(), publish: stub()};
  const plugins = getPlugins({cwd, logger: t.context.logger, options: {plugins: plugin1}}, {});

-  await plugins.verifyConditions({});
+  await plugins.verifyConditions({options: {}});
  t.true(plugin1.verifyConditions.calledOnce);

-  await plugins.publish({});
+  await plugins.publish({options: {}});
  t.true(plugin1.publish.calledOnce);

  // Verify the module returns a function for each plugin
@@ -105,26 +105,6 @@ test('Export plugins based on "plugins" config (single definition)', async t =>
  t.is(typeof plugins.fail, 'function');
 });

-test('Use only last definition of single plugin steps declared in "plugins" config', async t => {
-  const plugin1 = {analyzeCommits: stub()};
-  const plugin2 = {analyzeCommits: stub()};
-  const plugins = getPlugins({cwd, logger: t.context.logger, options: {plugins: [plugin1, plugin2]}}, {});
-
-  await plugins.analyzeCommits({commits: []});
-  t.true(plugin1.analyzeCommits.notCalled);
-  t.true(plugin2.analyzeCommits.calledOnce);
-
-  // Verify the module returns a function for each plugin
-  t.is(typeof plugins.verifyConditions, 'function');
-  t.is(typeof plugins.analyzeCommits, 'function');
-  t.is(typeof plugins.verifyRelease, 'function');
-  t.is(typeof plugins.generateNotes, 'function');
-  t.is(typeof plugins.prepare, 'function');
-  t.is(typeof plugins.publish, 'function');
-  t.is(typeof plugins.success, 'function');
-  t.is(typeof plugins.fail, 'function');
-});
-
 test('Merge global options, "plugins" options and step options', async t => {
  const plugin1 = [{verifyConditions: stub(), publish: stub()}, {pluginOpt1: 'plugin1'}];
  const plugin2 = [{verifyConditions: stub()}, {pluginOpt2: 'plugin2'}];
@@ -138,14 +118,14 @@ test('Merge global options, "plugins" options and step options', async t => {
    {}
  );

-  await plugins.verifyConditions({});
+  await plugins.verifyConditions({options: {}});
  t.deepEqual(plugin1[0].verifyConditions.args[0][0], {globalOpt: 'global', pluginOpt1: 'plugin1'});
  t.deepEqual(plugin2[0].verifyConditions.args[0][0], {globalOpt: 'global', pluginOpt2: 'plugin2'});

-  await plugins.publish({});
+  await plugins.publish({options: {}});
  t.deepEqual(plugin1[0].publish.args[0][0], {globalOpt: 'global', pluginOpt1: 'plugin1'});

-  await plugins.verifyRelease({});
+  await plugins.verifyRelease({options: {}});
  t.deepEqual(plugin3[0].args[0][0], {globalOpt: 'global', pluginOpt3: 'plugin3'});
 });

@@ -268,7 +248,7 @@ test('Merge global options with plugin options', async t => {
    {}
  );

-  const [result] = await plugins.verifyRelease();
+  const [result] = await plugins.verifyRelease({options: {}});

  t.deepEqual(result.pluginConfig, {localOpt: 'local', globalOpt: 'global', otherOpt: 'locally-defined'});
 });
@@ -25,7 +25,7 @@ test('validatePlugin', t => {
  t.false(validatePlugin({path: 1}), 'Object definition, wrong path');
 });

-test('validateStep: multiple/optional plugin configuration', t => {
+test('validateStep: optional plugin configuration', t => {
  const type = {multiple: true, required: false};

  // Empty config
@@ -107,8 +107,8 @@ test('validateStep: multiple/optional plugin configuration', t => {
  );
 });

-test('validateStep: multiple/required plugin configuration', t => {
-  const type = {multiple: true, required: true};
+test('validateStep: required plugin configuration', t => {
+  const type = {required: true};

  // Empty config
  t.false(validateStep(type));
@@ -189,98 +189,6 @@ test('validateStep: multiple/required plugin configuration', t => {
  );
 });

-test('validateStep: single/required plugin configuration', t => {
-  const type = {multiple: false, required: true};
-
-  // Empty config
-  t.false(validateStep(type));
-  t.false(validateStep(type, []));
-
-  // Single value definition
-  t.true(validateStep(type, 'plugin-path.js'));
-  t.true(validateStep(type, () => {}));
-  t.true(validateStep(type, ['plugin-path.js']));
-  t.true(validateStep(type, [() => {}]));
-  t.false(validateStep(type, {}));
-  t.false(validateStep(type, [{}]));
-
-  // Array type definition
-  t.true(validateStep(type, [['plugin-path.js']]));
-  t.true(validateStep(type, [['plugin-path.js', {options: 'value'}]]));
-  t.true(validateStep(type, [[() => {}, {options: 'value'}]]));
-  t.false(validateStep(type, [['plugin-path.js', 1]]));
-
-  // Object type definition
-  t.true(validateStep(type, {path: 'plugin-path.js'}));
-  t.true(validateStep(type, {path: 'plugin-path.js', options: 'value'}));
-  t.true(validateStep(type, {path: () => {}, options: 'value'}));
-  t.false(validateStep(type, {path: null}));
-
-  // Considered as one Array definition and not as an Array of 2 definitions in case of single plugin type
-  t.true(validateStep(type, [() => {}, {options: 'value'}]));
-  t.true(validateStep(type, ['plugin-path.js', {options: 'value'}]));
-
-  // Multiple definitions
-  t.false(
-    validateStep(type, [
-      'plugin-path.js',
-      () => {},
-      ['plugin-path.js'],
-      ['plugin-path.js', {options: 'value'}],
-      [() => {}, {options: 'value'}],
-      {path: 'plugin-path.js'},
-      {path: 'plugin-path.js', options: 'value'},
-      {path: () => {}, options: 'value'},
-    ])
-  );
-});
-
-test('validateStep: single/optional plugin configuration', t => {
-  const type = {multiple: false, required: false};
-
-  // Empty config
-  t.true(validateStep(type));
-  t.true(validateStep(type, []));
-
-  // Single value definition
-  t.true(validateStep(type, 'plugin-path.js'));
-  t.true(validateStep(type, () => {}));
-  t.true(validateStep(type, ['plugin-path.js']));
-  t.true(validateStep(type, [() => {}]));
-  t.false(validateStep(type, {}));
-  t.false(validateStep(type, [{}]));
-
-  // Array type definition
-  t.true(validateStep(type, [['plugin-path.js']]));
-  t.true(validateStep(type, [['plugin-path.js', {options: 'value'}]]));
-  t.true(validateStep(type, [[() => {}, {options: 'value'}]]));
-  t.false(validateStep(type, [['plugin-path.js', 1]]));
-
-  // Object type definition
-  t.true(validateStep(type, {path: 'plugin-path.js'}));
-  t.true(validateStep(type, {path: 'plugin-path.js', options: 'value'}));
-  t.true(validateStep(type, {path: () => {}, options: 'value'}));
-  t.false(validateStep(type, {path: null}));
-
-  // Considered as one Array definition and not as an Array of 2 definitions in case of single plugin type
-  t.true(validateStep(type, [() => {}, {options: 'value'}]));
-  t.true(validateStep(type, ['plugin-path.js', {options: 'value'}]));
-
-  // Multiple definitions
-  t.false(
-    validateStep(type, [
-      'plugin-path.js',
-      () => {},
-      ['plugin-path.js'],
-      ['plugin-path.js', {options: 'value'}],
-      [() => {}, {options: 'value'}],
-      {path: 'plugin-path.js'},
-      {path: 'plugin-path.js', options: 'value'},
-      {path: () => {}, options: 'value'},
-    ])
-  );
-});
-
 test('loadPlugin', t => {
  const cwd = process.cwd();
  const func = () => {};
@@ -0,0 +1,153 @@
+import test from 'ava';
+import AggregateError from 'aggregate-error';
+import {
+  extractErrors,
+  tagsToVersions,
+  isMajorRange,
+  isMaintenanceRange,
+  getUpperBound,
+  getLowerBound,
+  highest,
+  lowest,
+  getLatestVersion,
+  getEarliestVersion,
+  getFirstVersion,
+  getRange,
+  makeTag,
+} from '../lib/utils';
+
+test('extractErrors', t => {
+  const errors = [new Error('Error 1'), new Error('Error 2')];
+
+  t.deepEqual(extractErrors(new AggregateError(errors)), errors);
+  t.deepEqual(extractErrors(errors[0]), [errors[0]]);
+});
+
+test('tagsToVersions', t => {
+  t.deepEqual(tagsToVersions([{version: '1.0.0'}, {version: '1.1.0'}, {version: '1.2.0'}]), [
+    '1.0.0',
+    '1.1.0',
+    '1.2.0',
+  ]);
+});
+
+test('isMajorRange', t => {
+  t.false(isMajorRange('1.1.x'));
+  t.false(isMajorRange('1.1.X'));
+  t.false(isMajorRange('1.1.0'));
+
+  t.true(isMajorRange('1.x.x'));
+  t.true(isMajorRange('1.X.X'));
+  t.true(isMajorRange('1.x'));
+  t.true(isMajorRange('1.X'));
+});
+
+test('isMaintenanceRange', t => {
+  t.true(isMaintenanceRange('1.1.x'));
+  t.true(isMaintenanceRange('1.x.x'));
+  t.true(isMaintenanceRange('1.x'));
+  t.true(isMaintenanceRange('1.1.X'));
+  t.true(isMaintenanceRange('1.X.X'));
+  t.true(isMaintenanceRange('1.X'));
+
+  t.false(isMaintenanceRange('1.1.0'));
+  t.false(isMaintenanceRange('~1.0.0'));
+  t.false(isMaintenanceRange('^1.0.0'));
+});
+
+test('getUpperBound', t => {
+  t.is(getUpperBound('1.x.x'), '2.0.0');
+  t.is(getUpperBound('1.x'), '2.0.0');
+  t.is(getUpperBound('1.0.x'), '1.1.0');
+  t.is(getUpperBound('1.0.0'), '1.0.0');
+
+  t.is(getUpperBound('foo'), undefined);
+});
+
+test('getLowerBound', t => {
+  t.is(getLowerBound('1.x.x'), '1.0.0');
+  t.is(getLowerBound('1.x'), '1.0.0');
+  t.is(getLowerBound('1.0.x'), '1.0.0');
+  t.is(getLowerBound('1.0.0'), '1.0.0');
+
+  t.is(getLowerBound('foo'), undefined);
+});
+
+test('highest', t => {
+  t.is(highest('1.0.0', '2.0.0'), '2.0.0');
+  t.is(highest('1.1.1', '1.1.0'), '1.1.1');
+  t.is(highest(null, '1.0.0'), '1.0.0');
+  t.is(highest('1.0.0'), '1.0.0');
+  t.is(highest(), undefined);
+});
+
+test('lowest', t => {
+  t.is(lowest('1.0.0', '2.0.0'), '1.0.0');
+  t.is(lowest('1.1.1', '1.1.0'), '1.1.0');
+  t.is(lowest(null, '1.0.0'), '1.0.0');
+  t.is(lowest(), undefined);
+});
+
+test.serial('getLatestVersion', t => {
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1']), '1.2.0');
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1']), '1.2.0');
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1'], {withPrerelease: true}), '1.2.3-alpha.3');
+  t.is(getLatestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2'], {withPrerelease: true}), '1.2.3-alpha.3');
+
+  t.is(getLatestVersion([]), undefined);
+});
+
+test.serial('getEarliestVersion', t => {
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.0', '1.0.1-alpha.1']), '1.0.0');
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.0', '1.0.1-alpha.1']), '1.0.0');
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2']), undefined);
+
+  t.is(
+    getEarliestVersion(['1.2.3-alpha.3', '1.2.0', '1.0.1', '1.0.0-alpha.1'], {withPrerelease: true}),
+    '1.0.0-alpha.1'
+  );
+  t.is(getEarliestVersion(['1.2.3-alpha.3', '1.2.3-alpha.2'], {withPrerelease: true}), '1.2.3-alpha.2');
+
+  t.is(getEarliestVersion([]), undefined);
+});
+
+test('getFirstVersion', t => {
+  t.is(getFirstVersion(['1.2.0', '1.0.0', '1.3.0', '1.1.0', '1.4.0'], []), '1.0.0');
+  t.is(
+    getFirstVersion(
+      ['1.2.0', '1.0.0', '1.3.0', '1.1.0', '1.4.0'],
+      [
+        {name: 'master', tags: [{version: '1.0.0'}, {version: '1.1.0'}]},
+        {name: 'next', tags: [{version: '1.0.0'}, {version: '1.1.0'}, {version: '1.2.0'}]},
+      ]
+    ),
+    '1.3.0'
+  );
+  t.is(
+    getFirstVersion(
+      ['1.2.0', '1.0.0', '1.1.0'],
+      [
+        {name: 'master', tags: [{version: '1.0.0'}, {version: '1.1.0'}]},
+        {name: 'next', tags: [{version: '1.0.0'}, {version: '1.1.0'}, {version: '1.2.0'}]},
+      ]
+    ),
+    undefined
+  );
+});
+
+test('getRange', t => {
+  t.is(getRange('1.0.0', '1.1.0'), '>=1.0.0 <1.1.0');
+  t.is(getRange('1.0.0'), '>=1.0.0');
+});
+
+test('makeTag', t => {
+  t.is(makeTag(`v\${version}`, '1.0.0'), 'v1.0.0');
+  t.is(makeTag(`v\${version}`, '1.0.0', 'next'), 'v1.0.0@next');
+  t.is(makeTag(`v\${version}@test`, '1.0.0', 'next'), 'v1.0.0@next@test');
+});
@@ -5,61 +5,113 @@ import {gitRepo} from './helpers/git-utils';

 test('Throw a AggregateError', async t => {
  const {cwd} = await gitRepo();
-  const options = {};
+  const options = {branches: [{name: 'master'}, {name: ''}]};

  const errors = [...(await t.throws(verify({cwd, options})))];

  t.is(errors[0].name, 'SemanticReleaseError');
  t.is(errors[0].code, 'ENOREPOURL');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
  t.is(errors[1].name, 'SemanticReleaseError');
  t.is(errors[1].code, 'EINVALIDTAGFORMAT');
+  t.truthy(errors[1].message);
+  t.truthy(errors[1].details);
  t.is(errors[2].name, 'SemanticReleaseError');
  t.is(errors[2].code, 'ETAGNOVERSION');
+  t.truthy(errors[2].message);
+  t.truthy(errors[2].details);
+  t.is(errors[3].name, 'SemanticReleaseError');
+  t.is(errors[3].code, 'EINVALIDBRANCH');
+  t.truthy(errors[3].message);
+  t.truthy(errors[3].details);
 });

 test('Throw a SemanticReleaseError if does not run on a git repository', async t => {
  const cwd = tempy.directory();
-  const options = {};
+  const options = {branches: []};

  const errors = [...(await t.throws(verify({cwd, options})))];

  t.is(errors[0].name, 'SemanticReleaseError');
  t.is(errors[0].code, 'ENOGITREPO');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
 });

 test('Throw a SemanticReleaseError if the "tagFormat" is not valid', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: `?\${version}`};
+  const options = {repositoryUrl, tagFormat: `?\${version}`, branches: []};

  const errors = [...(await t.throws(verify({cwd, options})))];

  t.is(errors[0].name, 'SemanticReleaseError');
  t.is(errors[0].code, 'EINVALIDTAGFORMAT');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
 });

 test('Throw a SemanticReleaseError if the "tagFormat" does not contains the "version" variable', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: 'test'};
+  const options = {repositoryUrl, tagFormat: 'test', branches: []};

  const errors = [...(await t.throws(verify({cwd, options})))];

  t.is(errors[0].name, 'SemanticReleaseError');
  t.is(errors[0].code, 'ETAGNOVERSION');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
 });

 test('Throw a SemanticReleaseError if the "tagFormat" contains multiple "version" variables', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: `\${version}v\${version}`};
+  const options = {repositoryUrl, tagFormat: `\${version}v\${version}`, branches: []};

  const errors = [...(await t.throws(verify({cwd, options})))];

  t.is(errors[0].name, 'SemanticReleaseError');
  t.is(errors[0].code, 'ETAGNOVERSION');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+});
+
+test('Throw a SemanticReleaseError for each invalid branch', async t => {
+  const {cwd, repositoryUrl} = await gitRepo(true);
+  const options = {
+    repositoryUrl,
+    tagFormat: `v\${version}`,
+    branches: [{name: ''}, {name: '  '}, {name: 1}, {}, {name: ''}, 1, 'master'],
+  };
+
+  const errors = [...(await t.throws(verify({cwd, options})))];
+
+  t.is(errors[0].name, 'SemanticReleaseError');
+  t.is(errors[0].code, 'EINVALIDBRANCH');
+  t.truthy(errors[0].message);
+  t.truthy(errors[0].details);
+  t.is(errors[1].name, 'SemanticReleaseError');
+  t.is(errors[1].code, 'EINVALIDBRANCH');
+  t.truthy(errors[1].message);
+  t.truthy(errors[1].details);
+  t.is(errors[2].name, 'SemanticReleaseError');
+  t.is(errors[2].code, 'EINVALIDBRANCH');
+  t.truthy(errors[2].message);
+  t.truthy(errors[2].details);
+  t.is(errors[3].name, 'SemanticReleaseError');
+  t.is(errors[3].code, 'EINVALIDBRANCH');
+  t.truthy(errors[3].message);
+  t.truthy(errors[3].details);
+  t.is(errors[4].code, 'EINVALIDBRANCH');
+  t.truthy(errors[4].message);
+  t.truthy(errors[4].details);
+  t.is(errors[5].code, 'EINVALIDBRANCH');
+  t.truthy(errors[5].message);
+  t.truthy(errors[5].details);
 });

 test('Return "true" if all verification pass', async t => {
  const {cwd, repositoryUrl} = await gitRepo(true);
-  const options = {repositoryUrl, tagFormat: `v\${version}`};
+  const options = {repositoryUrl, tagFormat: `v\${version}`, branches: [{name: 'master'}]};

  await t.notThrows(verify({cwd, options}));
 });
Author	SHA1	Message	Date
Pierre Vanduynslager	b729183b4a	fix: fetch all release branches on CI	2018-11-29 20:03:51 -05:00
Pierre Vanduynslager	e63e753cf0	feat(package): update @semantic-release/commit-analyzer to version 7.0.0 BREAKING CHANGE: Regexp are not supported anymore for property matching in the `releaseRules` option. Regex are replaced by [globs](https://github.com/micromatch/micromatch#matching-features). For example `/core-./` should be changed to `'core-'`.	2018-11-29 14:13:03 -05:00
Pierre Vanduynslager	7b4052470b	feat: support multiple branches and distribution channels - Allow to configure multiple branches to release from - Allow to define a distribution channel associated with each branch - Manage the availability on distribution channels based on git merges - Support regular releases, maintenance releases and pre-releases - Add the `addChannel` plugin step to make an existing release available on a different distribution channel BREAKING CHANGE: the `branch` option has been removed in favor of `branches` The new `branches` option expect either an Array or a single branch definition. To migrate your configuration: - If you want to publish package from multiple branches, please the configuration documentation - If you use the default configuration and want to publish only from `master`: nothing to change - If you use the `branch` configuration and want to publish only from one branch: replace `branch` by `branches` (`"branch": "my-release-branch"` => `"branches": "my-release-branch"`)	2018-11-29 14:13:03 -05:00
Pierre Vanduynslager	7a9922a492	fix: rename default branch	2018-11-28 17:32:05 -05:00
Andy EdwardsandPierre Vanduynslager	d6d1bc954e	docs: grammar corrections	2018-11-27 16:04:50 -05:00
Pierre Vanduynslager	eafbb343dd	fix: correctly resolve plugins installed globally with `npx` This bug affects only plugins defined with the `plugins` option and wrapped in an Array to add a configuration	2018-11-26 18:39:28 -05:00
Pierre Vanduynslager	2b082acc73	fix: push only tags to remote repo	2018-11-21 12:32:01 -05:00
Pierre Vanduynslager	aa022e0ac2	test: clarify variables name	2018-11-21 12:32:01 -05:00
Pierre Vanduynslager	f2ede5bdde	docs: typo in JS docs	2018-11-19 18:34:16 -05:00
Pierre Vanduynslager	9742712957	test: verify errors have message and details	2018-11-19 18:34:16 -05:00
Pierre Vanduynslager	5937f13bdf	test: fix typo	2018-11-19 18:34:16 -05:00
Pierre Vanduynslager	43dbd10046	refactor: prefer filter shorter form	2018-11-19 18:34:16 -05:00
Pierre Vanduynslager	9f5645cfa0	refactor: harmonize git utils function names	2018-11-19 18:34:16 -05:00
Pierre Vanduynslager	e594638a96	test: prefer array spread	2018-11-19 18:34:16 -05:00
Kostis (Codefresh)andPierre Vanduynslager	244f014a91	docs: add Codefresh in list of CIs with pipelines	2018-11-18 14:59:12 -05:00
Waldir PimentaandPierre Vanduynslager	218d830af0	docs: fix quote marks (#986 )	2018-11-16 13:06:48 -05:00
Pierre Vanduynslager	90da6a0bc1	feat: add logs about `prepare`, `publish`, `success` and `fail` plugins skipped in dry-run mode	2018-11-14 11:27:06 -05:00
Pierre Vanduynslager	90b497464e	test: test that dry-run also skips `prepare` step	2018-11-14 11:27:06 -05:00
Pierre Vanduynslager	c86518a050	fix: do not underline log messages	2018-11-14 11:27:06 -05:00
Pierre Vanduynslager	e92c84ec08	fix: indicate in logs if running in dry-run mode	2018-11-14 11:27:06 -05:00
Pierre Vanduynslager	5180001ae6	feat: support multiple plugins for the `analyzeCommits` step In case multiple plugins with a `analyzeCommits` step are configured, all of them will be executed and the highest release type (`major` > `minor`, `patch`) will be used.	2018-11-12 15:06:46 -05:00
Pierre Vanduynslager	728ea34dda	fix: remove redundant log	2018-11-12 15:06:46 -05:00
Pierre Vanduynslager	83af7acf69	docs: mention default `analyzeCommits` plugin	2018-11-12 15:06:46 -05:00
Pierre Vanduynslager	8e564ebc9d	docs: update FAQ to reflect new `plugins` option	2018-11-09 17:08:49 -05:00
Pierre Vanduynslager	dff1f1056f	docs: mention `postversion` npm script hook to run build scripts	2018-11-09 17:08:49 -05:00
Pierre Vanduynslager	ae4995c867	style: fix prettier errors	2018-11-07 12:19:19 -05:00
greenkeeper[bot]andPierre Vanduynslager	669c9ed300	fix(package): update find-versions to version 3.0.0	2018-11-06 12:59:37 -05:00
Pierre Vanduynslager	3c8177aed8	fix: add debug logs for config file path	2018-11-02 15:00:12 -04:00
Pierre Vanduynslager	6d0bd8c9b1	fix: add debug logs for plugins resolved options	2018-11-02 15:00:12 -04:00
Pierre Vanduynslager	a99355effa	fix: remove dependency to `git-url-parse`	2018-10-27 09:35:45 -04:00
Pierre Vanduynslager	cc06d8999a	test: fix errors ordering in assertions	2018-10-27 09:35:45 -04:00
Lucas CorreiaandPierre Vanduynslager	3411520ea7	fix: include release notes in JS API result for dry mode	2018-10-20 12:37:11 -04:00
Pierre Vanduynslager	3d5db1f8b0	fix: remove debugging `console.error`	2018-10-20 04:24:21 -04:00
Cedric van PuttenandPierre Vanduynslager	cfc10039f3	docs: add semantic-release-expo to plugins list	2018-10-18 11:10:52 -04:00
Pierre Vanduynslager	0578c8b91c	fix: do not log outated branch error for missing permission cases	2018-10-17 15:33:16 -04:00
Pierre Vanduynslager	e29110103b	docs: add section existing tags in configuration docs	2018-10-09 22:02:34 -04:00
Pierre Vanduynslager	88539222f4	docs: add troubleshooting section for `reference already exists` Git error	2018-10-09 22:02:34 -04:00
Pierre Vanduynslager	d45861b989	docs: clarify the "npm missing permission" troubleshooting section	2018-10-09 22:02:34 -04:00
Pierre Vanduynslager	2ba0b81f39	docs: remove troubleshooting section related to legacy error messages	2018-10-09 22:02:34 -04:00
Pierre Vanduynslager	e93a663490	docs: fix markdown link in configuration docs	2018-10-09 22:02:34 -04:00
Pierre Vanduynslager	58c25beeb6	fix: fix logs for plugins loaded with `plugins` option	2018-10-09 16:33:37 -04:00