Skip to content
This repository was archived by the owner on Oct 24, 2023. It is now read-only.

Commit 2df6ebc

Browse files
author
Jens Schulze
committed
chore(Git): fix git hook for merge commits
1 parent 80f413a commit 2df6ebc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/validate-commit-msg.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var util = require('util');
4040

4141
var MAX_LENGTH = 100;
4242
var PATTERN = /^(?:fixup!\s*)?(\w*)(\(([\w\$\.\*/-]*)\))?\: (.*)$/;
43-
var IGNORED = /^WIP\:/;
43+
var IGNORED = /^WIP\:|^Merge/;
4444
var TYPES = {
4545
feat: true,
4646
fix: true,

0 commit comments

Comments
 (0)