您当前的位置： 首页 > 学无止境 > 心得笔记 网站首页心得笔记

20 怎么比较工作区和暂存区所...

发布时间：2020-07-18 17:49:42编辑：雪饮阅读（）

添加暂存区与不添加暂存区

这里先修改下1.txt并添加到暂存区

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ vi 1.txt

 

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ git add 1.txt

warning: LF will be replaced by CRLF in 1.txt.

The file will have its original line endings in your working directory

 

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ git status

On branch master

Changes to be committed:

  (use "git restore --staged <file>..." to unstage)

        modified:   1.txt

然后修改2.txt不添加到暂存区

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ vi 2.txt

用git diff命令不带参数默认就是对比工作空间与暂存区的区别的，所以接下来我们用git diff查看下比较结果

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ git diff

warning: LF will be replaced by CRLF in 2.txt.

The file will have its original line endings in your working directory

diff --git a/2.txt b/2.txt

index e69de29..0cfbf08 100644

--- a/2.txt

+++ b/2.txt

@@ -0,0 +1 @@

+2

会发现这里就是刚才修改的2.txt对比出来差异结果了，因为刚才修改的1.txt已经加入到暂存区了。

暂存区与工作空间的差异存在于多个文件中

接下来我们修改3.txt

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ vi 3.txt

此时再次比对会发现2.txt和3.txt都有差异了

$ git diff

warning: LF will be replaced by CRLF in 2.txt.

The file will have its original line endings in your working directory

warning: LF will be replaced by CRLF in 3.txt.

The file will have its original line endings in your working directory

diff --git a/2.txt b/2.txt

index e69de29..0cfbf08 100644

--- a/2.txt

+++ b/2.txt

@@ -0,0 +1 @@

+2

diff --git a/3.txt b/3.txt

index e69de29..00750ed 100644

--- a/3.txt

+++ b/3.txt

@@ -0,0 +1 @@

+3

那么如何查看指定某个文件的对比结果呢？只需要在上面命令后面用--指定文件名即可

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ git diff -- 2.txt

warning: LF will be replaced by CRLF in 2.txt.

The file will have its original line endings in your working directory

diff --git a/2.txt b/2.txt

index e69de29..0cfbf08 100644

--- a/2.txt

+++ b/2.txt

@@ -0,0 +1 @@

+2

 

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ git diff -- 3.txt

warning: LF will be replaced by CRLF in 3.txt.

The file will have its original line endings in your working directory

diff --git a/3.txt b/3.txt

index e69de29..00750ed 100644

--- a/3.txt

+++ b/3.txt

@@ -0,0 +1 @@

+3

那么，如果指定查看多个文件之间的差异呢？只需要指定多个文件名即可，如

xy@DESKTOP-BG9HNHK MINGW64 ~/Desktop/web/we5 (master)

$ git diff -- 3.txt 2.txt

warning: LF will be replaced by CRLF in 2.txt.

The file will have its original line endings in your working directory

warning: LF will be replaced by CRLF in 3.txt.

The file will have its original line endings in your working directory

diff --git a/2.txt b/2.txt

index e69de29..0cfbf08 100644

--- a/2.txt

+++ b/2.txt

@@ -0,0 +1 @@

+2

diff --git a/3.txt b/3.txt

index e69de29..00750ed 100644

--- a/3.txt

+++ b/3.txt

@@ -0,0 +1 @@

+3