Skip to content

Commit

Permalink
Add pre-merge-commit (#605)
Browse files Browse the repository at this point in the history
  • Loading branch information
yanamura authored and typicode committed Nov 16, 2019
1 parent 3a844a6 commit 2b601d2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/installer/index.ts
Expand Up @@ -11,6 +11,7 @@ const hookList = [
'pre-applypatch',
'post-applypatch',
'pre-commit',
'pre-merge-commit',
'prepare-commit-msg',
'commit-msg',
'post-commit',
Expand Down
1 change: 1 addition & 0 deletions src/upgrader/index.ts
Expand Up @@ -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',
Expand Down

0 comments on commit 2b601d2

Please sign in to comment.