diff --git a/README.md b/README.md
index 3eab7b9..0dfbcc8 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ More advanced options are
 * `m` or `meaning` Meaning of capturing block in title's regular expression
 * `f` or `file` JSON Configuration file, better option when you don't want to pass all parameters to the command line, for an example see [options.json](https://github.com/ariatemplates/git-release-notes/blob/master/options.json)
 * `s` or `script` External script for post-processing commits
+* `c` or `merge-commits` List only merge commits, `git log` command is executed with the `--merges` flag instead of `--no-merges`
 
 #### Title Parsing
 
diff --git a/index.js b/index.js
index 00e4be1..d4b4847 100755
--- a/index.js
+++ b/index.js
@@ -22,13 +22,16 @@ var argv = require("optimist").usage("git-release-notes [<options>] <since>..<un
 .options("s", {
 	"alias": "script"
 })
+.boolean("c")
+.alias("c", "merge-commits")
 .describe({
 	"f": "Configuration file",
 	"p": "Git project path",
 	"t": "Commit title regular expression",
 	"m": "Meaning of capturing block in title's regular expression",
 	"b": "Git branch, defaults to master",
-	"s": "External script to rewrite the commit history"
+	"s": "External script to rewrite the commit history",
+	"c": "Only use merge commits"
 })
 .boolean("version")
 .check(function (argv) {
@@ -83,7 +86,8 @@ fs.readFile(template, function (err, templateContent) {
 				range: argv._[0],
 				title: new RegExp(options.t),
 				meaning: Array.isArray(options.m) ? options.m: [options.m],
-				cwd: options.p
+				cwd: options.p,
+				mergeCommits: options.c
 			}, function (commits) {
 				postProcess(templateContent, commits);
 			});
@@ -105,7 +109,8 @@ function getOptions (callback) {
 						b: stored.b || stored.branch || argv.b,
 						t: stored.t || stored.title || argv.t,
 						m: stored.m || stored.meaning || argv.m,
-						p: stored.p || stored.path || argv.p
+						p: stored.p || stored.path || argv.p,
+						c: stored.c || stored.mergeCommits || argv.c
 					};
 				} catch (ex) {
 					console.error("Invalid JSON in configuration file");
diff --git a/lib/git.js b/lib/git.js
index bfa1fda..e35746b 100644
--- a/lib/git.js
+++ b/lib/git.js
@@ -3,7 +3,8 @@ var parser = require("debug")("release-notes:parser");
 
 exports.log = function (options, callback) {
 	var spawn = require("child_process").spawn;
-	var gitArgs = ["log", "--no-color", "--no-merges", "--branches=" + options.branch, "--format=" + formatOptions, options.range];
+	var commits = options.mergeCommits ? "--merges" : "--no-merges";
+	var gitArgs = ["log", "--no-color", commits, "--branches=" + options.branch, "--format=" + formatOptions, options.range];
 	debug("Spawning git with args %o", gitArgs);
 	var gitLog = spawn("git", gitArgs, {
 		cwd : options.cwd,
diff --git a/package.json b/package.json
index 46ffc94..ab5aa70 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "date-fns": "^1.28.4",
     "debug": "^2.6.0",
-    "ejs": "^2.5.5",
+    "ejs": "^2.5.7",
     "optimist": "^0.6.1"
   },
   "contributors": [
@@ -39,7 +39,7 @@
   "homepage": "https://github.com/ariatemplates/git-release-notes",
   "preferGlobal": true,
   "devDependencies": {
-    "cross-env": "^5.0.0",
-    "eslint": "^4.0.0"
+    "cross-env": "^5.0.5",
+    "eslint": "^4.5.0"
   }
 }