From 2b601d238361ffc9b237f969b050e3fb70ddb7e1 Mon Sep 17 00:00:00 2001
From: Yasuharu Yanamura <yanamura3@gmail.com>
Date: Sat, 16 Nov 2019 16:14:49 +0900
Subject: [PATCH] Add pre-merge-commit (#605)

---
 src/installer/index.ts | 1 +
 src/upgrader/index.ts  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/installer/index.ts b/src/installer/index.ts
index db0d6d791..e48f8f6b9 100644
--- a/src/installer/index.ts
+++ b/src/installer/index.ts
@@ -11,6 +11,7 @@ const hookList = [
   'pre-applypatch',
   'post-applypatch',
   'pre-commit',
+  'pre-merge-commit',
   'prepare-commit-msg',
   'commit-msg',
   'post-commit',
diff --git a/src/upgrader/index.ts b/src/upgrader/index.ts
index 668591e54..ac643ceb2 100644
--- a/src/upgrader/index.ts
+++ b/src/upgrader/index.ts
@@ -19,6 +19,7 @@ const hookList: HookMap = {
   preapplypatch: 'pre-applypatch',
   preautogc: 'pre-auto-gc',
   precommit: 'pre-commit',
+  premergecommit: 'pre-merge-commit',
   preparecommitmsg: 'prepare-commit-msg',
   prepush: 'pre-push',
   prerebase: 'pre-rebase',