Merge pull request #6 from joaquin-corchero/master

Added options for filtering messages
This closes #5

README.md

@@ -30,4 +30,5 @@ There are optional arguments such as:
 
 - `--draft=true` To set the release as a draft. Default: `false`
 - `--prerelease=true` To set the release as a prerelease. Default: `false`
-- `--prefix=v` Add a prefix to the tag version `e.g. v1.0.1`
+- `--prefix=v` Add a prefix to the tag version `e.g. v1.0.1`
+- `--includemessages=merges/commits/all` used to filter the messages added to the release notes. Default: `commits` 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "github-release-notes",
-  "version": "0.3.3",
+  "version": "0.4.0",
   "description": "Node module to publish release notes based on commits between the last two tags.",
   "main": "./github-release-notes.js",
   "scripts": {

src/index.js

@@ -69,11 +69,19 @@ function prepareRelease(gren, tagName, commitMessages) {
    var body = commitMessages
       .slice(0, -1)
       .filter(function (message) {
-         return !message.match(/^merge/i);
+          switch(gren.includemessages)
+          {
+              case 'merges':
+                return message.match(/^merge/i);
+              case "all":
+                return true;
+              default:
+                 return !message.match(/^merge/i);
+          }
       })
       .map(createBody)
       .join('\n');
-
+      
    var releaseOptions = {
       tag_name: tagName,
       name: (gren.options.prefix || '') + tagName,
@@ -212,6 +220,7 @@ function GithubReleaseNotes(options) {
      auth: 'oauth'
    });
 
+   this.includemessages = this.options.includemessages || "commits";
    this.repo = github.getRepo(this.options.username, this.options.repo);
 }