From b89690acddad289ed9b1557715f0c15721027b9b Mon Sep 17 00:00:00 2001
From: Peter Trifanov <peter.trifanov@mail.ru>
Date: Thu, 2 Jul 2020 19:54:37 +0300
Subject: [PATCH] Fixed commit message pattern in commit-msg hook

### What's done:
* Changed pattern so that it allows local merging
---
 .git-hooks/commit-msg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.git-hooks/commit-msg.sh b/.git-hooks/commit-msg.sh
index 051cd61834..f465ed4d47 100644
--- a/.git-hooks/commit-msg.sh
+++ b/.git-hooks/commit-msg.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-commit_pattern="### What's done:"
+commit_pattern="(Merge (remote-tracking )?branch|### What's done:)"
 error_msg="Your commit message doesn't match the pattern $commit_pattern. Please fix it."
 
 if [[ ! $( cat "$1" ) =~ $commit_pattern ]]