From cc7a23f715e7c5acfbf9a96f8ec23d22b65abd29 Mon Sep 17 00:00:00 2001 From: wubin Date: Tue, 22 Sep 2020 14:20:54 +0800 Subject: [PATCH 1/3] update --- dsSupport/Shell/start.sh | 1 - 1 file changed, 1 deletion(-) 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 From 2133cbc825facc5122c0a391bdf23b70de3f0aca Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Tue, 22 Sep 2020 14:28:17 +0800 Subject: [PATCH 2/3] 'commit' --- 一键推拉.cmd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/一键推拉.cmd b/一键推拉.cmd index 0fa5c4dc..ffd82124 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 From d33f775c5452b1735fe8c72483542a05bcf8d311 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Tue, 22 Sep 2020 14:29:05 +0800 Subject: [PATCH 3/3] 'commit' --- 一键推拉.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/一键推拉.cmd b/一键推拉.cmd index ffd82124..e2826c95 100644 --- a/一键推拉.cmd +++ b/一键推拉.cmd @@ -1,4 +1,4 @@ -#提交时转换为LF,检出时不转换(以上问题使用此命令可解决) +:: 提交时转换为LF,检出时不转换(以上问题使用此命令可解决) git config --global core.autocrlf input git add -A .