CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
 
 Generated by [auto-changelog](https://github.com/CookPete/auto-changelog).
 
+#### [v1.0.1](https://github.com/CookPete/auto-changelog/compare/v1.0.0...v1.0.1)
+> 27 October 2017
+- Filter out commits with the same message as an existing merge [`2a420f7`](https://github.com/CookPete/auto-changelog/commit/2a420f793ac3b761291cfd5499676a80953cbee7)
+- Update readme [`54fc665`](https://github.com/CookPete/auto-changelog/commit/54fc6659e9283b6d6afc95486893aa56df13111c)
+
 #### [v1.0.0](https://github.com/CookPete/auto-changelog/compare/v0.3.6...v1.0.0)
 > 27 October 2017
 - Update dependencies to enable Greenkeeper 🌴 [`#10`](https://github.com/CookPete/auto-changelog/pulls/10)

README.md

@@ -17,9 +17,10 @@ If you are upgrading from `0.x`, the same options are still supported out of the
   - If you still want to use the [`keepachangelog`](http://keepachangelog.com) format, use `--template keepachangelog`
 - Templates now use `-` instead of `*` for lists
 - Up to 3 commits are now shown per release
-- Unreleased changes are no longer listed by default, use `--unreleased` to list them
+- Unreleased changes are no longer listed by default, use `--unreleased` to include them
 - [GitLab](https://gitlab.com) and [BitBucket](https://bitbucket.org) are now fully supported
 
+If anything isn’t working correctly, [open an issue](https://github.com/CookPete/auto-changelog/issues).
 
 ### Installation
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-changelog",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Command line tool for generating a changelog from git tags and commit history",
   "bin": {
     "auto-changelog": "./lib/index.js"

src/releases.js

@@ -23,7 +23,7 @@ export function parseReleases (commits, origin, packageVersion, includeUnrelease
         fixes: commit.fixes,
         commit
       })
-    } else if (filterCommit(commit)) {
+    } else if (filterCommit(commit, release.merges)) {
       release.commits.push(commit)
     }
   }
@@ -45,8 +45,16 @@ function newRelease (tag = null, date = new Date().toISOString()) {
   return release
 }
 
-function filterCommit (commit) {
-  return !semver.valid(commit.subject) // Filter out version commits
+function filterCommit (commit, merges) {
+  if (semver.valid(commit.subject)) {
+    // Filter out version commits
+    return false
+  }
+  if (merges.findIndex(m => m.message === commit.subject) !== -1) {
+    // Filter out commits with the same message as an existing merge
+    return false
+  }
+  return true
 }
 
 function getCompareLink (from, to, origin) {