feat(wildcards): add new wildcard patterns #315

* feat(utils): ignore IntelliJ project files * feat(is-ignored): add new wildcard patterns (#315)
conventional-changelog · Aug 20, 2018 · e9ea17f · e9ea17f
1 parent d636811
commit e9ea17f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ package-lock.json
 .*.dockerfile
 lib/
 package.json.lerna_backup
+/*.iml
diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js
@@ -16,6 +16,8 @@ const WILDCARDS = [
 				.trim()
 		),
 	c => c.match(/^Merged (.*?)(in|into) (.*)/),
+	c => c.match(/^Merge remote-tracking branch (.*)/),
+	c => c.match(/^Automatic merge from (.*)/),
 	c => c.match(/^Auto-merged (.*?) into (.*)/)
 ];