Git diff

首先来了解Git的三个区域

  1. working directory
  2. staging area
  3. git directory(repository)

如图这里写图片描述
我新建了一个git_diff文件,在其中添加了一句话:Add a new sentence.添加(add)并提交(commit)到版本库(repository).
紧接着添加了一句话:Add another sentence. 只进行了添加(add)操作,没有提交
最后添加了一句话:Add the last sentence.没有进行任何操作,我们来看用不同命令进行比较的结果:

andy@andy-PC:~/Projects/Git/Git$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    modified:   git_diff

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

    modified:   git_diff

andy@andy-PC:~/Projects/Git/Git$ git diff git_diff
diff --git a/git_diff b/git_diff
index 43ca7ef..d9c2bf0 100644
--- a/git_diff
+++ b/git_diff
@@ -1,3 +1,4 @@
 To understand how to use diff in git.
 Add a new sentence.
 Add a another sentence.
+Add the last sentence.

andy@andy-PC:~/Projects/Git/Git$ git diff --cached git_diff
diff --git a/git_diff b/git_diff
index 38aa546..43ca7ef 100644
--- a/git_diff
+++ b/git_diff
@@ -1,2 +1,3 @@
 To understand how to use diff in git.
 Add a new sentence.
+Add a another sentence.

andy@andy-PC:~/Projects/Git/Git$ git diff HEAD git_diff
diff --git a/git_diff b/git_diff
index 38aa546..d9c2bf0 100644
--- a/git_diff
+++ b/git_diff
@@ -1,2 +1,4 @@
 To understand how to use diff in git.
 Add a new sentence.
+Add a another sentence.
+Add the last sentence.

怎么样,是不是一目了然了呢,正如你所看见的:
git diff 比较的是working directory 与 staging area的不同
git diff –cached 比较的是staging area 与 git directory(repository)的不同
git diff HEAD 比较的是working directory 与 git directory(repository) 的不同
(小小白原创,欢迎指正交流,不喜勿喷)

  • 0
    点赞
  • 0
    收藏
    觉得还不错? 一键收藏
  • 0
    评论

“相关推荐”对你有帮助么?

  • 非常没帮助
  • 没帮助
  • 一般
  • 有帮助
  • 非常有帮助
提交
评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值