From 0f43cf48483c11c7207076747b5c169cc290ee93 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Wed, 10 Apr 2019 14:44:23 -0700
Subject: [PATCH 01/15] root-commit


From 1eac9ca0fe2c586e129cb887f67a6ba9f65f12c1 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Wed, 10 Apr 2019 15:32:19 -0700
Subject: [PATCH 02/15] chore(release): 1.1.0

---
 CHANGELOG.md | 9 +++++++++
 package.json | 7 ++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eeaeacd35..fb0b8a261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+# [1.1.0](https://github.com/conventional-changelog/standard-version/compare/v5.0.2...v1.1.0) (2019-04-10)
+
+
+### Features
+
+* update commit msg for when using commitAll ([#320](https://github.com/conventional-changelog/standard-version/issues/320)) ([74a040a](https://github.com/conventional-changelog/standard-version/commit/74a040a))
+
+
+
 ## [5.0.2](https://github.com/conventional-changelog/standard-version/compare/v5.0.1...v5.0.2) (2019-03-16)
 
 
diff --git a/package.json b/package.json
index 8a19460fd..7ba24cc29 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "standard-version",
-  "version": "5.0.2",
+  "version": "1.1.0",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {
-    "pretest": "eslint .",
+    "posttest": "eslint .",
     "coverage": "nyc report --reporter=text-lcov | coveralls",
     "test": "nyc mocha --timeout=20000 test.js",
     "release": "bin/cli.js"
@@ -45,6 +45,7 @@
     "detect-newline": "^2.1.0",
     "dotgitignore": "^2.1.0",
     "figures": "^2.0.0",
+    "find-up": "^3.0.0",
     "fs-access": "^1.0.0",
     "git-semver-tags": "^2.0.2",
     "semver": "^5.2.0",
@@ -53,7 +54,7 @@
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "coveralls": "^3.0.1",
+    "coveralls": "^3.0.3",
     "eslint": "^5.16.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-plugin-import": "^2.16.0",

From 289700c926b1969bcfbe69aea79711206af3913a Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Wed, 10 Apr 2019 15:51:31 -0700
Subject: [PATCH 03/15] feat: adds new conventionalcommits configurable preset

BREAKING CHANGE: we are moving from the angular to the conventionalcommits preset.
---
 command.js                  | 13 ++++++++++---
 defaults.json               |  4 ++--
 lib/lifecycles/bump.js      |  3 ++-
 lib/lifecycles/changelog.js |  3 ++-
 lib/preset-loader.js        | 22 ++++++++++++++++++++++
 test.js                     | 30 ++++++++++++++++++++++++++++--
 6 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 lib/preset-loader.js

diff --git a/command.js b/command.js
index 23e3ab2d5..c7431da91 100755
--- a/command.js
+++ b/command.js
@@ -1,4 +1,9 @@
-let defaults = require('./defaults')
+const findUp = require('find-up')
+const defaults = require('./defaults')
+const { readFileSync } = require('fs')
+
+const configPath = findUp.sync(['.versionrc', '.version.json'])
+const config = configPath ? JSON.parse(readFileSync(configPath)) : {}
 
 module.exports = require('yargs')
   .usage('Usage: $0 [options]')
@@ -95,11 +100,13 @@ module.exports = require('yargs')
       return true
     }
   })
-  .version()
   .alias('version', 'v')
-  .help()
   .alias('help', 'h')
   .example('$0', 'Update changelog and tag release')
   .example('$0 -m "%s: see changelog for details"', 'Update changelog and tag release with custom commit message')
   .pkgConf('standard-version')
+  .config(config)
   .wrap(97)
+
+// TODO: yargs should be populated with keys/descriptions from
+// https://github.com/conventional-changelog/conventional-changelog-config-spec
diff --git a/defaults.json b/defaults.json
index 17035be47..c5bc42198 100644
--- a/defaults.json
+++ b/defaults.json
@@ -11,5 +11,5 @@
   "skip": {},
   "dryRun": false,
   "gitTagFallback": true,
-  "preset": "angular"
-}
+  "preset": "conventionalcommits"
+}
\ No newline at end of file
diff --git a/lib/lifecycles/bump.js b/lib/lifecycles/bump.js
index a62d770b5..0fd0a1ac7 100644
--- a/lib/lifecycles/bump.js
+++ b/lib/lifecycles/bump.js
@@ -9,6 +9,7 @@ const figures = require('figures')
 const fs = require('fs')
 const DotGitignore = require('dotgitignore')
 const path = require('path')
+const presetLoader = require('../preset-loader')
 const runLifecycleScript = require('../run-lifecycle-script')
 const semver = require('semver')
 const stringifyPackage = require('stringify-package')
@@ -137,7 +138,7 @@ function bumpVersion (releaseAs, args) {
     } else {
       conventionalRecommendedBump({
         debug: args.verbose && console.info.bind(console, 'conventional-recommended-bump'),
-        preset: args.preset || 'angular',
+        preset: presetLoader(args),
         path: args.path
       }, function (err, release) {
         if (err) return reject(err)
diff --git a/lib/lifecycles/changelog.js b/lib/lifecycles/changelog.js
index da47f5415..f32eabdda 100644
--- a/lib/lifecycles/changelog.js
+++ b/lib/lifecycles/changelog.js
@@ -3,6 +3,7 @@ const chalk = require('chalk')
 const checkpoint = require('../checkpoint')
 const conventionalChangelog = require('conventional-changelog')
 const fs = require('fs')
+const presetLoader = require('../preset-loader')
 const runLifecycleScript = require('../run-lifecycle-script')
 const writeFile = require('../write-file')
 
@@ -32,7 +33,7 @@ function outputChangelog (args, newVersion) {
     if (args.dryRun) context = { version: newVersion }
     let changelogStream = conventionalChangelog({
       debug: args.verbose && console.info.bind(console, 'conventional-changelog'),
-      preset: args.preset || 'angular',
+      preset: presetLoader(args),
       tagPrefix: args.tagPrefix
     }, context, { merges: null, path: args.path })
       .on('error', function (err) {
diff --git a/lib/preset-loader.js b/lib/preset-loader.js
new file mode 100644
index 000000000..47920b3a4
--- /dev/null
+++ b/lib/preset-loader.js
@@ -0,0 +1,22 @@
+// TODO: this should be replaced with an object we maintain and
+// describe in: https://github.com/conventional-changelog/conventional-changelog-config-spec
+const spec = {
+  types: {},
+  commitUrlFormat: {},
+  compareUrlFormat: {},
+  issueUrlFormat: {},
+  userUrlFormat: {}
+}
+
+module.exports = (args) => {
+  let preset = args.preset || 'conventionalcommits'
+  if (preset === 'conventionalcommits') {
+    preset = {
+      name: preset
+    }
+    Object.keys(spec).forEach(key => {
+      if (args[key]) preset[key] = args[key]
+    })
+  }
+  return preset
+}
diff --git a/test.js b/test.js
index 363d07f89..28d73e283 100644
--- a/test.js
+++ b/test.js
@@ -668,13 +668,13 @@ describe('cli', function () {
   })
 
   it('does not display `all staged files` without the --commit-all flag', function () {
-    var result = execCli()
+    let result = execCli()
     result.code.should.equal(0)
     result.stdout.should.not.match(/and all staged files/)
   })
 
   it('does display `all staged files` if the --commit-all flag is passed', function () {
-    var result = execCli('--commit-all')
+    let result = execCli('--commit-all')
     result.code.should.equal(0)
     result.stdout.should.match(/and all staged files/)
   })
@@ -989,4 +989,30 @@ describe('standard-version', function () {
         })
     })
   })
+
+  describe('configuration', () => {
+    it('reads config from .versionrc', function () {
+      // we currently skip several replacments in CHANGELOG
+      // generation if repository URL isn't set.
+      //
+      // TODO: consider modifying this logic in conventional-commits
+      // perhaps we should only skip the replacement if we rely on
+      // the {{host}} field?
+      writePackageJson('1.0.0', {
+        repository: {
+          url: 'https://github.com/yargs/yargs.git'
+        }
+      })
+      // write configuration that overrides default issue
+      // URL format.
+      fs.writeFileSync('.versionrc', JSON.stringify({
+        issueUrlFormat: 'http://www.foo.com/{{id}}'
+      }), 'utf-8')
+      commit('feat: another commit addresses issue #1')
+      execCli()
+      // CHANGELOG should have the new issue URL format.
+      const content = fs.readFileSync('CHANGELOG.md', 'utf-8')
+      content.should.include('http://www.foo.com/1')
+    })
+  })
 })

From bd3a1d4b25465d58ff75b1d7727935b74e034e4b Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Wed, 10 Apr 2019 16:37:38 -0700
Subject: [PATCH 04/15] revert updating CHANGELOG/pacakge.json

---
 CHANGELOG.md | 9 ---------
 package.json | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0b8a261..eeaeacd35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,15 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-# [1.1.0](https://github.com/conventional-changelog/standard-version/compare/v5.0.2...v1.1.0) (2019-04-10)
-
-
-### Features
-
-* update commit msg for when using commitAll ([#320](https://github.com/conventional-changelog/standard-version/issues/320)) ([74a040a](https://github.com/conventional-changelog/standard-version/commit/74a040a))
-
-
-
 ## [5.0.2](https://github.com/conventional-changelog/standard-version/compare/v5.0.1...v5.0.2) (2019-03-16)
 
 
diff --git a/package.json b/package.json
index 7ba24cc29..d21d3f132 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "1.1.0",
+  "version": "5.0.2",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {

From 41c1de55a3441eea21fef349846a140d52b5e3fc Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Thu, 18 Apr 2019 15:59:13 -0700
Subject: [PATCH 05/15] root-commit


From 050382f6a9e74eda0073598bd2e7b012b9aa643c Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Thu, 18 Apr 2019 16:00:31 -0700
Subject: [PATCH 06/15] chore: update deps

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d21d3f132..8e1c1f136 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,8 @@
   "homepage": "https://github.com/conventional-changelog/standard-version#readme",
   "dependencies": {
     "chalk": "^2.4.1",
-    "conventional-changelog": "^3.0.6",
-    "conventional-recommended-bump": "^4.0.4",
+    "conventional-changelog": "^3.1.2",
+    "conventional-recommended-bump": "^4.1.1",
     "detect-indent": "^5.0.0",
     "detect-newline": "^2.1.0",
     "dotgitignore": "^2.1.0",

From 2db948a111cc0914bb13377ca4bc63ec06d18204 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 20:58:30 -0700
Subject: [PATCH 07/15] chore(release): 6.0.0

---
 CHANGELOG.md | 15 +++++++++++++++
 package.json |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eeaeacd35..49060f032 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+# [6.0.0](https://github.com/conventional-changelog/standard-version/compare/v5.0.1...v6.0.0) (2019-05-05)
+
+
+### Features
+
+* adds new conventionalcommits configurable preset ([289700c](https://github.com/conventional-changelog/standard-version/commit/289700c))
+* update commit msg for when using commitAll ([#320](https://github.com/conventional-changelog/standard-version/issues/320)) ([74a040a](https://github.com/conventional-changelog/standard-version/commit/74a040a))
+
+
+### BREAKING CHANGES
+
+* we are moving from the angular to the conventionalcommits preset.
+
+
+
 ## [5.0.2](https://github.com/conventional-changelog/standard-version/compare/v5.0.1...v5.0.2) (2019-03-16)
 
 
diff --git a/package.json b/package.json
index 8e1c1f136..e80b8018f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "5.0.2",
+  "version": "6.0.0",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {
@@ -40,6 +40,7 @@
   "dependencies": {
     "chalk": "^2.4.1",
     "conventional-changelog": "^3.1.2",
+    "conventional-changelog-config-spec": "^1.0.0",
     "conventional-recommended-bump": "^4.1.1",
     "detect-indent": "^5.0.0",
     "detect-newline": "^2.1.0",

From 459a561e10c1c8246e84b37192901ccf84ec54b0 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 20:58:37 -0700
Subject: [PATCH 08/15] chore(release): 6.0.1

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49060f032..53f4d17bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.1](https://github.com/conventional-changelog/standard-version/compare/v6.0.0...v6.0.1) (2019-05-05)
+
+
+
 # [6.0.0](https://github.com/conventional-changelog/standard-version/compare/v5.0.1...v6.0.0) (2019-05-05)
 
 
diff --git a/package.json b/package.json
index e80b8018f..39d22823a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {

From bde10097a6771a868b4088526a8b188f56d6c176 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 20:58:54 -0700
Subject: [PATCH 09/15] chore(release): 6.0.2

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f4d17bb..d8c5b4ba1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.2](https://github.com/conventional-changelog/standard-version/compare/v6.0.1...v6.0.2) (2019-05-05)
+
+
+
 ## [6.0.1](https://github.com/conventional-changelog/standard-version/compare/v6.0.0...v6.0.1) (2019-05-05)
 
 
diff --git a/package.json b/package.json
index 39d22823a..2e86e2645 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {

From 381f3e3c00a13a3302b700eb29da55c7a959180a Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 20:59:01 -0700
Subject: [PATCH 10/15] chore(release): 6.0.3

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8c5b4ba1..501062bc8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.3](https://github.com/conventional-changelog/standard-version/compare/v6.0.2...v6.0.3) (2019-05-05)
+
+
+
 ## [6.0.2](https://github.com/conventional-changelog/standard-version/compare/v6.0.1...v6.0.2) (2019-05-05)
 
 
diff --git a/package.json b/package.json
index 2e86e2645..c5b850788 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {

From 60521f328c169ed493dddff821b8e6e4137c4a37 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 21:00:53 -0700
Subject: [PATCH 11/15] chore(release): 6.0.4

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 501062bc8..d4d618fea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.4](https://github.com/conventional-changelog/standard-version/compare/v6.0.3...v6.0.4) (2019-05-05)
+
+
+
 ## [6.0.3](https://github.com/conventional-changelog/standard-version/compare/v6.0.2...v6.0.3) (2019-05-05)
 
 
diff --git a/package.json b/package.json
index c5b850788..43a541cba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "6.0.3",
+  "version": "6.0.4",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {

From 1ccf30396f42eb34f1420271a5e8f864497e10f1 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 21:01:06 -0700
Subject: [PATCH 12/15] chore(release): 6.0.5

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4d618fea..5e55fc864 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [6.0.5](https://github.com/conventional-changelog/standard-version/compare/v6.0.4...v6.0.5) (2019-05-05)
+
+
+
 ## [6.0.4](https://github.com/conventional-changelog/standard-version/compare/v6.0.3...v6.0.4) (2019-05-05)
 
 
diff --git a/package.json b/package.json
index 43a541cba..8bae48dc1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "6.0.4",
+  "version": "6.0.5",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {

From de2907bf46f40348175dc01689c40fa828d57c31 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 21:07:24 -0700
Subject: [PATCH 13/15] chore: use conventional-changelog-config-spec

---
 command.js           | 15 ++++++++++++++-
 lib/preset-loader.js | 12 +++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/command.js b/command.js
index c7431da91..4ea6c1c3e 100755
--- a/command.js
+++ b/command.js
@@ -4,8 +4,9 @@ const { readFileSync } = require('fs')
 
 const configPath = findUp.sync(['.versionrc', '.version.json'])
 const config = configPath ? JSON.parse(readFileSync(configPath)) : {}
+const spec = require('conventional-changelog-config-spec')
 
-module.exports = require('yargs')
+const yargs = require('yargs')
   .usage('Usage: $0 [options]')
   .option('release-as', {
     alias: 'r',
@@ -108,5 +109,17 @@ module.exports = require('yargs')
   .config(config)
   .wrap(97)
 
+Object.keys(spec.properties).forEach(propertyKey => {
+  const property = spec.properties[propertyKey]
+  yargs.option(propertyKey, {
+    type: property.type,
+    describe: property.description,
+    default: property.default,
+    group: 'Preset Configuration:'
+  })
+})
+
+module.exports = yargs
+
 // TODO: yargs should be populated with keys/descriptions from
 // https://github.com/conventional-changelog/conventional-changelog-config-spec
diff --git a/lib/preset-loader.js b/lib/preset-loader.js
index 47920b3a4..72cb4d3ad 100644
--- a/lib/preset-loader.js
+++ b/lib/preset-loader.js
@@ -1,12 +1,6 @@
 // TODO: this should be replaced with an object we maintain and
 // describe in: https://github.com/conventional-changelog/conventional-changelog-config-spec
-const spec = {
-  types: {},
-  commitUrlFormat: {},
-  compareUrlFormat: {},
-  issueUrlFormat: {},
-  userUrlFormat: {}
-}
+const spec = require('conventional-changelog-config-spec')
 
 module.exports = (args) => {
   let preset = args.preset || 'conventionalcommits'
@@ -14,8 +8,8 @@ module.exports = (args) => {
     preset = {
       name: preset
     }
-    Object.keys(spec).forEach(key => {
-      if (args[key]) preset[key] = args[key]
+    Object.keys(spec.properties).forEach(key => {
+      if (args[key] !== undefined) preset[key] = args[key]
     })
   }
   return preset

From e911582187ba8c643468e00f092ab4c792df6e72 Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 21:29:28 -0700
Subject: [PATCH 14/15] docs: document configuring standard-version in README

---
 README.md    | 33 +++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 956efb947..6d6b7d35d 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,39 @@ Now you can use `standard-version` in place of `npm version`.
 
 This has the benefit of allowing you to use `standard-version` on any repo/package without adding a dev dependency to each one.
 
+## Configuration
+
+You can configure `standard-version` either by:
+
+1. Placing a `standard-version` stanza in your `package.json` (assuming
+   your project is JavaScript).
+1. Creating a `.versionrc` or `.versionrc.json`.
+
+Any of the command line paramters accepted by `standard-version` can instead
+be provided via configuration.
+
+### Customizing CHANGELOG Generation
+
+By default, `standard-version` uses the [conventionalcommits preset](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-conventionalcommits).
+
+This preset:
+
+* adheres closely to the [conventionalcommits.org](https://www.conventionalcommits.org)
+  specification.
+* is highly configurable, following the configuration specification
+  [maintained here](https://github.com/conventional-changelog/conventional-changelog-config-spec).
+  * _we've documented these config settings as a recommendation to other tooling makers._
+
+There are a variety of dials and knobs you can turn related to CHANGELOG generation.
+
+As an example, suppose you're using GitLab, rather than GitHub, you might modify the following variables:
+
+* `commitUrlFormat`: the URL format of commit SHAs detected in commit messages.
+* `compareUrlFormat`: the URL format used to compare two tags.
+* `issueUrlFormat`: the URL format used to link to issues.
+
+Making these URLs match GitLab's format, rather than GitHub's.
+
 ## CLI Usage
 
 ### First Release
diff --git a/package.json b/package.json
index 8bae48dc1..5bdcca035 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standard-version",
-  "version": "6.0.5",
+  "version": "5.0.2",
   "description": "replacement for `npm version` with automatic CHANGELOG generation",
   "bin": "bin/cli.js",
   "scripts": {

From 227712d7eaf930fb8896c26e6391ac3bcb810edb Mon Sep 17 00:00:00 2001
From: bcoe <bencoe@google.com>
Date: Sat, 4 May 2019 21:31:13 -0700
Subject: [PATCH 15/15] chore: revert accidental changes to CHANGELOG

---
 CHANGELOG.md | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e55fc864..eeaeacd35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,41 +2,6 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [6.0.5](https://github.com/conventional-changelog/standard-version/compare/v6.0.4...v6.0.5) (2019-05-05)
-
-
-
-## [6.0.4](https://github.com/conventional-changelog/standard-version/compare/v6.0.3...v6.0.4) (2019-05-05)
-
-
-
-## [6.0.3](https://github.com/conventional-changelog/standard-version/compare/v6.0.2...v6.0.3) (2019-05-05)
-
-
-
-## [6.0.2](https://github.com/conventional-changelog/standard-version/compare/v6.0.1...v6.0.2) (2019-05-05)
-
-
-
-## [6.0.1](https://github.com/conventional-changelog/standard-version/compare/v6.0.0...v6.0.1) (2019-05-05)
-
-
-
-# [6.0.0](https://github.com/conventional-changelog/standard-version/compare/v5.0.1...v6.0.0) (2019-05-05)
-
-
-### Features
-
-* adds new conventionalcommits configurable preset ([289700c](https://github.com/conventional-changelog/standard-version/commit/289700c))
-* update commit msg for when using commitAll ([#320](https://github.com/conventional-changelog/standard-version/issues/320)) ([74a040a](https://github.com/conventional-changelog/standard-version/commit/74a040a))
-
-
-### BREAKING CHANGES
-
-* we are moving from the angular to the conventionalcommits preset.
-
-
-
 ## [5.0.2](https://github.com/conventional-changelog/standard-version/compare/v5.0.1...v5.0.2) (2019-03-16)