Merge branch 'master' of http://10.10.14.250:3000/huanghai/dsMin

5 years ago · c62ea68710
parent cef5aa6da7 d33f775c54
commit c62ea68710
2 changed files with 3 additions and 1 deletions
--- a/dsSupport/Shell/start.sh
+++ b/dsSupport/Shell/start.sh
@ -7,4 +7,3 @@ sleep 3
 chmod +x dsSupport
 # 运行为后台进程
 nohup /usr/local/dsMin/dsSupport/dsSupport  >> /usr/local/dsMin/dsSupport/dsSupport.log 2>&1 &
- 
--- a/一键推拉.cmd
+++ b/一键推拉.cmd
@ -1,3 +1,6 @@
+:: 提交时转换为LF，检出时不转换（以上问题使用此命令可解决）
+git config --global core.autocrlf input
+
 git add -A .
 git commit -am 'commit'
 git pull