Git++ - 有趣的命令
2017-04-16 17:01
351 查看
本文主要介绍一些我在日常开发中觉得比较有趣的Git
日常开发中,差异对比是执行比较频繁的命令
尚未暂存的
注 : 别名
尚未暂存的
从
必须进行
只从
from: http://zhongmingmao.me/2017/04/14/git-basic/?hmsr=toutiao.io&utm_medium=toutiao.io&utm_source=toutiao.io
基础命令
差异对比
日常开发中,差异对比是执行比较频繁的命令HEAD一般指向当前分支的最后一次
Commit,下面三种是我最常用的差异对比
git
diff
尚未暂存的Working Tree与
HEAD的差异
git
diff –cached
Index与
HEAD的差异
注 : 别名
git diff --staged
git
diff HEAD
尚未暂存的Working Tree+
Index与
HEAD的差异
操作实例
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455 | $ gst -sb## master$ lsREADME.md$ echo 'Hello' >> README.md$ gst -sb## master M README.md$ git diffdiff --git a/README.md b/README.mdindex e69de29..e965047 100644--- a/README.md+++ b/README.md@@ -0,0 +1 @@+Hello$ git diff --cached # Stdout print nothing$ git diff HEADdiff --git a/README.md b/README.mdindex e69de29..e965047 100644--- a/README.md+++ b/README.md@@ -0,0 +1 @@+Hello-------------------$ git add README.md-------------------$ gst -sb## masterM README.md$ git diff # Stdout print nothing$ git diff --cacheddiff --git a/README.md b/README.mdindex e69de29..e965047 100644--- a/README.md+++ b/README.md@@ -0,0 +1 @@+Hello$ git diff HEADdiff --git a/README.md b/README.mdindex e69de29..e965047 100644--- a/README.md+++ b/README.md@@ -0,0 +1 @@+Hello |
移除版本控制
git rm只会将文件或目录从版本控制中移除,但并不会从以前的提交记录中移除文件或目录
git
rm
从Working Tree和
Index中移除
必须进行
up-to-date检查,如果文件或目录在
Working Tree或
Index中的状态与
HEAD不一致,则执行失败
1234567891011121314151617181920212223242526272829303132333435363738394041 | $ gst -sb## master$ lsREADME.md$ git rm README.mdrm 'README.md'$ gst -sb## masterD README.md$ ls # Stdout print nothing-------------------------------------------------$ git reset --hard HEAD # Reset HEAD , danger opsHEAD is now at 03e27f0 init commit-------------------------------------------------$ echo 'Hello' > README.md$ gst -sb## master M README.md$ git rm README.mderror: the following file has local modifications: README.md(use --cached to keep the file, or -f to force removal)$ git add README.md$ gst -sb## masterM README.md$ git rm README.mderror: the following file has local modifications: README.md(use --cached to keep the file, or -f to force removal) |
git
rm -f
强制从
Working Tree和
Index中移除,不进行
up-to-date检查
12345678910111213141516171819202122 | $ gst -sb## master$ lsREADME.md$ echo 'Hello' > README.md$ git add README.md$ gst -sb## masterM README.md$ git rm -f README.mdrm 'README.md'$ gst -sb## masterD README.md$ ls # Stdout print nothing |
git
rm –cached
只从Index中移除,保留
Working Tree中的文件状态
123456789101112131415161718192021222324 | $ gst -sb## master$ lsREADME.md$ echo 'Hello' > README.md$ git add README.md$ gst -sb## masterM README.md$ git rm --cached README.mdrm 'README.md'$ gst -sb # README从Index删除,但保留在Working Tree中## masterD README.md?? README.md$ cat README.mdHello |
重命名
12345678910111213141516171819202122 | $ gstOn branch masternothing to commit, working tree clean$ ls README.md src$ find README.md srcREADME.mdsrcsrc/Hello.javasrc/World.java$ git mv README.md README.md.bak$ git mv src src.bak$ git -sb## masterR README.md -> README.md.bakR src/Hello.java -> src.bak/Hello.javaR src/World.java -> src.bak/World.java |
查看提交历史
常规查看(最常用)
--graph:图形化显示分支提交历史
--oneline:一个提交显示一行
--decorate:显示分支引用
123456789101112 | $ git log --graph --oneline --decorate* 807adc2 (HEAD -> master) C8* 537a716 C7* a272a81 M1|\| * c94d37d (topic) C4| * 25737e7 C3* | 78dd014 C6* | 92ad9ff C5|/* c110877 C2* 3847d71 C1 |
格式化显示
%h:Commit对象的简短哈希串
%t:Tree对象的简短哈希串
%p:父Commit对象的简短哈希串
%an:作者名字
%ae:作者邮件
%ad:修订日期
%s:Commit Message
123456789101112 | $ git log --pretty=format:"%h %t %p %an %s" --graph* 807adc2 bf5ac3a 537a716 zhongmingmao C8* 537a716 f2e0d63 a272a81 zhongmingmao C7* a272a81 525cbc2 78dd014 c94d37d zhongmingmao M1|\| * c94d37d 99248a5 25737e7 zhongmingmao C4| * 25737e7 cc4ec62 c110877 zhongmingmao C3* | 78dd014 a2622d9 92ad9ff zhongmingmao C6* | 92ad9ff 771d565 c110877 zhongmingmao C5|/* c110877 e7b3299 3847d71 zhongmingmao C2* 3847d71 fd092f0 zhongmingmao C1 |
提交历史搜索
--grep:搜索提交说明
--author:匹配作者
--committer:匹配提交者
--after:时间起点
--before:时间终点
--:特定路径
123456789101112 | # 查找条件$ git log --oneline --decorate --graph --grep=C --author=zhongmingmao --committer=zhongmingmao \--after=2017-01-01 --before=2018-01-01 -- .* 807adc2 (HEAD -> master) C8* 537a716 C7* c94d37d (topic) C4* 25737e7 C3| * 78dd014 C6| * 92ad9ff C5|/* c110877 C2* 3847d71 C1 |
撤销操作
撤销Commit
git commit --amend会重新生成新的Commit对象
修改提交日志
123456789101112131415 | $ git log --oneline --decorate --graph* d12ae38 (HEAD -> master) add README.md$ gstOn branch masternothing to commit, working tree clean$ git commit --amend -m 'amend commit msg' # Create new commit object[master 4e4145a] amend commit msg Date: Fri Apr 14 19:39:45 2017 +0800 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.md$ git log --oneline --decorate --graph* 4e4145a (HEAD -> master) amend commit msg |
合并修改+修改提交日志
123456789101112131415161718 | $ git log --oneline --decorate --graph* 9c9ab11 (HEAD -> master) C2* e1fbcea C1$ gst -sb## masterA C3$ git commit --amend -m 'C3' # Create new commit object , merge last commit(C2) [master de41093] C3 Date: Fri Apr 14 19:48:58 2017 +0800 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 C2 create mode 100644 C3 $ git log --oneline --decorate --graph* de41093 (HEAD -> master) C3* e1fbcea C1 |
撤销Index
的修改
git reset HEAD==
git reset --mixed HEAD,用
HEAD覆盖
Index
12345678910111213141516171819202122232425262728293031323334353637383940414243444546 | $ gst -sb## masterMM C3$ git diffdiff --git a/C3 b/C3index f70f10e..35d242b 100644--- a/C3+++ b/C3@@ -1 +1,2 @@ A+B$ git diff --cacheddiff --git a/C3 b/C3index e69de29..f70f10e 100644--- a/C3+++ b/C3@@ -0,0 +1 @@+A$ git diff HEADdiff --git a/C3 b/C3index e69de29..35d242b 100644--- a/C3+++ b/C3@@ -0,0 +1,2 @@+A+B$ git reset HEAD C3 # Just reset Index , Not Working TreeUnstaged changes after reset:M C3$ gst -sb## master M C3 $ git diffdiff --git a/C3 b/C3index e69de29..35d242b 100644--- a/C3+++ b/C3@@ -0,0 +1,2 @@+A+B |
撤销Working
Tree
的修改
git checkout --,用
Index覆盖
Working Tree
1234567891011121314151617181920 | $ gst -sb## masterMM C3$ git diffdiff --git a/C3 b/C3index f70f10e..35d242b 100644--- a/C3+++ b/C3@@ -1 +1,2 @@ A+B$ git checkout -- C3$ gst -sb## masterM C3$ git diff # Stdout print nothing |
撤销Index
和Working
Tree
的修改
git reset --hard HEAD,
git checkout HEAD [filename]是危险操作,将会丢失上次Commit后的所有修改,用
HEAD覆盖
Index和
Working Tree
1234567891011121314 | $ git log --oneline --decorate --graphde41093 (HEAD -> master) C3* e1fbcea C1$ gst -sb## masterMM C3$ git reset --hard HEADHEAD is now at de41093 C3$ gstOn branch masternothing to commit, working tree clean |
123456789 | $ gst -sb## masterMM C3$ git checkout HEAD C3$ gstOn branch masternothing to commit, working tree clean |
相关文章推荐