update

build/hooks.js

@@ -4,14 +4,17 @@
 * https://github.com/typicode/husky/issues/71
 * https://github.com/typicode/husky/issues/
 * 主要是读取 .git/COMMIT_EDITMSG 这个文件，文件记录了当前commit之后的信息
+// MERGE_MSG
 */
 var fs = require('fs');
 var path = require('path');
-console.log(process.argv)
 // console.log('______', process.env.HUSKY_GIT_STDIN, process.env.HUSKY_GIT_PARAMS, process.env.GIT_INTERNAL_GETTEXT_SH_SCHEME, process.env.GIT_AUTHOR_EMAIL)
 var gitPath = path.resolve(__dirname, `../${process.env.HUSKY_GIT_PARAMS}`);
 var commitMsg = fs.readFileSync(gitPath, 'utf-8');
-console.log(commitMsg.toString())
+// var gitMerge = path.resolve(__dirname, '../.git/MERGE_MSG');
+// var mergeMsg = fs.readFileSync(gitMerge, 'utf-8');
+
+// console.log(mergeMsg.toString())
 var pattern = /<<< HEAD/g;
 
 if (pattern.test(commitMsg)) {