Commit 619719de authored by shangbj's avatar shangbj

update

parent a8aebbf8
......@@ -4,7 +4,7 @@ const chalk = require('chalk')
const logSymbols = require('log-symbols')
const execSync = require('child_process').execSync
const gitPath = path.join(process.cwd(), process.env.HUSKY_GIT_PARAMS);
const gitPath = path.join(process.cwd(), '.git/COMMIT_EDITMSG');
const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG')
function mergeCheck(){
......
......@@ -4,7 +4,7 @@ const chalk = require('chalk')
const logSymbols = require('log-symbols')
const execSync = require('child_process').execSync
const gitPath = path.join(process.cwd(), process.env.HUSKY_GIT_PARAMS);
const gitPath = path.join(process.cwd(), '.git/COMMIT_EDITMSG');
const mergeMsgPath = path.join(gitPath,'../','MERGE_MSG')
function mergeCheck(){
......
......@@ -12,8 +12,8 @@
},
"husky": {
"hooks": {
"commit-msg": "node ./build/commit-hook.js $HUSKY_GIT_PARAMS",
"prepare-commit-msg": "node ./build/merge-hook.js $HUSKY_GIT_PARAMS"
"pre-commit": "node ./build/commit-hook.js $HUSKY_GIT_PARAMS",
"pre-merge-commit": "node ./build/merge-hook.js $HUSKY_GIT_PARAMS"
}
},
"keywords": [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment