diff --git a/dsSupport/Shell/start.sh b/dsSupport/Shell/start.sh index ae89fb98..65ee546b 100644 --- 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 & - \ No newline at end of file diff --git a/一键推拉.cmd b/一键推拉.cmd index 0fa5c4dc..e2826c95 100644 --- a/一键推拉.cmd +++ b/一键推拉.cmd @@ -1,3 +1,6 @@ +:: 提交时转换为LF,检出时不转换(以上问题使用此命令可解决) +git config --global core.autocrlf input + git add -A . git commit -am 'commit' git pull