From 636c84b799bfc0c5122c8978129b760cc864a29a Mon Sep 17 00:00:00 2001 From: Louis Pontoise Date: Tue, 12 Jun 2018 18:45:32 +0200 Subject: [PATCH 1/2] feat(utils): ignore IntelliJ project files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index bf132e0781..e485aaeee4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ package-lock.json .*.dockerfile lib/ package.json.lerna_backup +/*.iml From d4ab0f851e9a501b0f02da04e9d14542d4b44244 Mon Sep 17 00:00:00 2001 From: Louis Pontoise Date: Tue, 12 Jun 2018 18:46:05 +0200 Subject: [PATCH 2/2] feat(is-ignored): add new wildcard patterns (#315) --- @commitlint/is-ignored/src/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/@commitlint/is-ignored/src/index.js b/@commitlint/is-ignored/src/index.js index e21484a06c..839786d2ab 100644 --- 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 (.*)/) ];