坑爹的git diff

[Administrator@RobertNote@/e/SRAll/AllMayDay/2016-08-26/2017-03_Arch/GitLatest/CEP@周二 2017-12-12@16:42:26]
7553 $ git diff defaultVars/CEP/defaultVars.substvar
diff --git a/defaultVars/CEP/defaultVars.substvar b/defaultVars/CEP/defaultVars.substvar
index 71b760c..eb0670f 100644
--- a/defaultVars/CEP/defaultVars.substvar
+++ b/defaultVars/CEP/defaultVars.substvar
@@ -1,13 +1,13 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-<repository xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xmlns = "http://www.tibco.com/xmlns/repo/types/2002">

```
  <globalVariables>
```
```
          <globalVariable>
```

                  <name>emsserver</name>

                  <value>tcp://172.17.0.12:7222</value>

                  <deploymentSettable>true</deploymentSettable>

                  <serviceSettable>false</serviceSettable>

```
                  <type>String</type>
```

                  <modTime>1504235354712</modTime>

```
          </globalVariable>
```
```
  </globalVariables>
```

-</repository>
+<?xml version = "1.0" encoding = "UTF-8"?>
+<repository xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance" xmlns = "http://www.tibco.com/xmlns/repo/types/2002">

```
  <globalVariables>
```
```
          <globalVariable>
```

                  <name>emsserver</name>

                  <value>tcp://localhost:7222</value>

                  <deploymentSettable>true</deploymentSettable>

                  <serviceSettable>false</serviceSettable>

```
                  <type>String</type>
```

                  <modTime>1513067110187</modTime>

```
          </globalVariable>
```
```
  </globalVariables>
```

+</repository>
\ No newline at end of file
[Administrator@RobertNote@/e/SRAll/AllMayDay/2016-08-26/2017-03_Arch/GitLatest/CEP@周二 2017-12-12@16:42:31]
7554 $ git config --global core.autocrlf true
[Administrator@RobertNote@/e/SRAll/AllMayDay/2016-08-26/2017-03_Arch/GitLatest/CEP@周二 2017-12-12@16:43:11]
7555 $ git diff defaultVars/CEP/defaultVars.substvar
diff --git a/defaultVars/CEP/defaultVars.substvar b/defaultVars/CEP/defaultVars.substvar
index 71b760c..a481a29 100644
--- a/defaultVars/CEP/defaultVars.substvar
+++ b/defaultVars/CEP/defaultVars.substvar
@@ -3,11 +3,11 @@
<globalVariables>
<globalVariable>
<name>emsserver</name>

                  <value>tcp://172.17.0.12:7222</value>

                  <value>tcp://localhost:7222</value>
                  <deploymentSettable>true</deploymentSettable>
                  <serviceSettable>false</serviceSettable>
                  <type>String</type>

                  <modTime>1504235354712</modTime>

                  <modTime>1513067110187</modTime>
          </globalVariable>
  </globalVariables>

-</repository>
+</repository>
\ No newline at end of file

注释：太坑爹了，只有再次执行 git config --global core.autocrlf true
才可以让diff显示少点儿完全没被修改的东西！！

©著作权归作者所有,转载或内容合作请联系作者
【社区内容提示】社区部分内容疑似由AI辅助生成，浏览时请结合常识与多方信息审慎甄别。
平台声明：文章内容（如有图片或视频亦包括在内）由作者上传并发布，文章内容仅代表作者本人观点，简书系信息发布平台，仅提供信息存储服务。

坑爹的git diff

坑爹的git diff

相关阅读更多精彩内容

友情链接更多精彩内容