From b0fe4a22630b8a54a8ca6621c73a4fc6aa943261 Mon Sep 17 00:00:00 2001
From: Cedric van Putten <me@bycedric.com>
Date: Fri, 2 Mar 2018 13:35:59 +0100
Subject: [PATCH] feat: add bitbucket merge commits to ignore list

---
 @commitlint/is-ignored/src/index.js      | 3 ++-
 @commitlint/is-ignored/src/index.test.js | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js
index 813cb8b34d..69333b7002 100644
--- a/@commitlint/is-ignored/src/index.js
+++ b/@commitlint/is-ignored/src/index.js
@@ -14,7 +14,8 @@ const WILDCARDS = [
 				.shift()
 				.replace(/^chore(\([^)]+\))?:/, '')
 				.trim()
-		)
+		),
+	c => c.match(/^Merged (.*?)(in|into) (.*)/)
 ];
 
 export default function isIgnored(commit = '') {
diff --git a/@commitlint/is-ignored/src/index.test.js b/@commitlint/is-ignored/src/index.test.js
index 8adb2260dd..3457bec5a2 100644
--- a/@commitlint/is-ignored/src/index.test.js
+++ b/@commitlint/is-ignored/src/index.test.js
@@ -96,3 +96,10 @@ test('should return true fixup commits', t => {
 test('should return true squash commits', t => {
 	t.true(isIgnored('squash! initial commit'));
 });
+
+test('should return true for bitbucket merge commits', t => {
+	t.true(
+		isIgnored('Merged in feature/facebook-friends-sync (pull request #8)')
+	);
+	t.true(isIgnored('Merged develop into feature/component-form-select-card'));
+});