Merge pull request #35 from ddialar/master

toplenboren · web-flow · commit d6b6ce549755 · 2021-03-19T05:29:21.000+05:00
chore/add-new-hook
diff --git a/cli.js b/cli.js
@@ -8,8 +8,8 @@ const {setHooksFromConfig} = require('./simple-git-hooks')
 
 try {
     setHooksFromConfig(process.cwd())
+    console.log('[INFO] Successfully set all git hooks')
 } catch (e) {
     console.log('[ERROR], Was not able to set git hooks. Error: ' + e)
 }
 
-console.log('[INFO] Successfully set all git hooks')
diff --git a/simple-git-hooks.js b/simple-git-hooks.js
@@ -6,6 +6,7 @@ const VALID_GIT_HOOKS = [
     'applypatch-msg',
     'commit-msg',
     'fsmonitor-watchman',
+    'post-merge',
     'post-update',
     'pre-applypatch',
     'pre-commit',

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ const {setHooksFromConfig} = require('./simple-git-hooks')`
`8`	`8`
`9`	`9`	`try {`
`10`	`10`	`setHooksFromConfig(process.cwd())`
	`11`	`+ console.log('[INFO] Successfully set all git hooks')`
`11`	`12`	`} catch (e) {`
`12`	`13`	`console.log('[ERROR], Was not able to set git hooks. Error: ' + e)`
`13`	`14`	`}`
`14`	`15`
`15`		`-console.log('[INFO] Successfully set all git hooks')`