有人可以帮我在git和svn中制作diff的含义

时间:2013-02-15 14:29:36

标签: git svn diff

这是我得到的差异

的输出
diff --git a/README.md b/README.md
index cda48bc..95ce355 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 THIS IS LINE 1
-THIS IS LINE 2
+THIS IS LINE X
 THIS IS LINE 3

工作区中的文件看起来像这样

 THIS IS LINE 1
 THIS IS LINE X
 THIS IS LINE 3

暂存中的文件看起来像这样

 THIS IS LINE 1
 THIS IS LINE 2
 THIS IS LINE 3

那么以下是什么意思......我真的不明白差异输出

diff --git a/README.md b/README.md
index cda48bc..95ce355 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 THIS IS LINE 1
-THIS IS LINE 2
+THIS IS LINE X
 THIS IS LINE 3

2 个答案:

答案 0 :(得分:4)

统一差异的格式和含义很好地解释了on Wikipedia

答案 1 :(得分:2)

你可以这样读:

-THIS IS LINE 2

+这是第X行

在第一个文件中,“THIS IS LINE 2”行不存在,而是替换为“THIS IS LINE X”。