Git07-标签与diff

1、标签

git的标签主要有2种：轻量级标签和带有附注标签。

#创建轻量级标签
git tag XXX
​
#创建一个带有附注的标签
git tag -a XXX -m 附注内容
​
#删除标签
git tag -d tag_name

示例

16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag 标签1
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag list
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag -d list
Deleted tag 'list' (was c649328)
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag -a 标签2 -m 这是一个附注标签
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag
标签1
标签2

选择性查找

16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag -l 标签1
标签1
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag -l '*1'
标签1
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git tag -l '标签*'
标签1
标签2

2、查看上一次修改的信息

16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git blame test.txt
^afd6099 (Oliver            2022-06-01 07:59:06 +0800 1) hello world
c22a20fe (Oliver            2022-06-03 10:15:41 +0800 2) welcome
00000000 (Not Committed Yet 2022-06-03 16:37:18 +0800 3) hello python

3、diff

可以用于比较两个文件的差别，创建文件a和文件b

比较两个文件：

16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ diff a b
2c2
< hello world1
---
> hello world2
5c5,6
< hello world4
---
> hello world 4
> hello world5
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ diff -u a b
--- a   2022-06-03 16:43:34.144380500 +0800
+++ b   2022-06-03 16:44:09.106125900 +0800
@@ -1,5 +1,6 @@
 hello world
-hello world1
+hello world2
 hello world2
 hello world3
-hello world4
+hello world 4
+hello world5

看上面@@ -1,5 +1,6 @@，-就是第一个文件从第一行到第五行，+就是第二个文件从第一行到第六行。

4、git diff

比较工作区和暂存区的差异：

16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ vim b
​
16140@DESKTOP-NF7R8DC MINGW64 /d/笔记和课程/code review/mygit (new_branch2)
$ git diff
warning: LF will be replaced by CRLF in b.
The file will have its original line endings in your working directory
diff --git a/b b/b
index e69de29..e61ef7b 100644
--- a/b
+++ b/b
@@ -0,0 +1 @@
+aa

各个diff的含义

• git diff：暂存区与工作区文件之间的差别
• git diff HEAD：比较的是最新提交与工作区之间的差别
• git diff --cached：比较的是最新的提交和暂存区之间的差别

\