{"id":338,"date":"2025-10-05T21:12:22","date_gmt":"2025-10-05T13:12:22","guid":{"rendered":"https:\/\/www.xxiaoteng.cn\/?p=338"},"modified":"2026-05-11T21:26:10","modified_gmt":"2026-05-11T13:26:10","slug":"git%e5%b8%b8%e7%94%a8%e5%91%bd%e4%bb%a4","status":"publish","type":"post","link":"https:\/\/www.xxiaoteng.cn\/?p=338","title":{"rendered":"git\u5e38\u7528\u547d\u4ee4"},"content":{"rendered":"\n

git status\/git status -s<\/h2>\n\n\n\n

\u67e5\u770b\u72b6\u6001<\/p>\n\n\n\n

[root@wing git_data]# git status
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u65e0\u63d0\u4ea4
\u65e0\u6587\u4ef6\u8981\u63d0\u4ea4\uff08\u521b\u5efa\/\u62f7\u8d1d\u6587\u4ef6\u5e76\u4f7f\u7528 \"git add\" \u5efa\u7acb\u8ddf\u8e2a\uff09
[root@wing git_data]# touch a b c
[root@wing git_data]# ls
a  b  c
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u65e0\u63d0\u4ea4
\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6:
  \uff08\u4f7f\u7528 \"git add <\u6587\u4ef6>...\" \u4ee5\u5305\u542b\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
    a
    b
    c
\u63d0\u4ea4\u4e3a\u7a7a\uff0c\u4f46\u662f\u5b58\u5728\u5c1a\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6\uff08\u4f7f\u7528 \"git add\" \u5efa\u7acb\u8ddf\u8e2a\uff09 <\/pre>\n\n\n\n
git add<\/h2>\n\n\n\n
\u6682\u5b58\u5185\u5bb9<\/p>\n\n\n\n
[root@wing git_data]# git add a
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u65e0\u63d0\u4ea4
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git rm --cached <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
    \u65b0\u6587\u4ef6\uff1a   a
\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6:
  \uff08\u4f7f\u7528 \"git add <\u6587\u4ef6>...\" \u4ee5\u5305\u542b\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
    b
    c
[root@wing git_data]# ll .git\/
\u603b\u7528\u91cf 16
drwxr-xr-x 2 root root   6 4\u6708   3 05:34 branches
-rw-r--r-- 1 root root  92 4\u6708   3 05:34 config
-rw-r--r-- 1 root root  73 4\u6708   3 05:34 description
-rw-r--r-- 1 root root  23 4\u6708   3 05:34 HEAD
drwxr-xr-x 2 root root 301 4\u6708   3 05:34 hooks
-rw-r--r-- 1 root root  96 4\u6708   5 06:05 index
#\u4f60\u4f1a\u53d1\u73b0index\u7684\u65f6\u95f4\u4ea7\u751f\u4e86\u53d8\u5316\uff0c\u8fd9\u610f\u5473\u7740\uff0c\u6211\u4eec\u4f7f\u7528git add\u547d\u4ee4\u5c06\u6587\u4ef6\u63d0\u4ea4\u5230\u4e86\u6682\u5b58\u533a\u57df
drwxr-xr-x 2 root root  21 4\u6708   3 05:34 info
drwxr-xr-x 5 root root  40 4\u6708   5 06:05 objects
drwxr-xr-x 4 root root  31 4\u6708   3 05:34 refs
[root@wing git_data]# ll .git\/objects\/
\u603b\u7528\u91cf 0
drwxr-xr-x 2 root root 52 4\u6708   5 06:05 e6
drwxr-xr-x 2 root root  6 4\u6708   3 05:34 info
drwxr-xr-x 2 root root  6 4\u6708   3 05:34 pack
[root@wing objects]# ls e6
9de29bb2d1d6434b8b29ae775ad8c2e48c5391
[root@wing objects]# cat e6\/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 
#\u5728objects\u76ee\u5f55\u4e2d\u53ef\u4ee5\u770b\u5230\u5df2\u5143\u6570\u636e\u5f62\u5f0f\u5b58\u50a8\u7684a\u6587\u4ef6\uff0c\u8fd9\u4e2a\u6211\u4eec\u770b\u4e0d\u61c2\uff0c\u6211\u4eec\u53ef\u4ee5\u5c06\u6570\u636e\u90fd\u6dfb\u52a0
 
\u200b
[root@wing git_data]# git add .  #\u53ef\u4ee5\u4f7f\u7528.\u4e5f\u53ef\u4ee5\u4f7f\u7528*
[root@wing git_data]# git status
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u65e0\u63d0\u4ea4
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git rm --cached <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
    \u65b0\u6587\u4ef6\uff1a   a
    \u65b0\u6587\u4ef6\uff1a   b
    \u65b0\u6587\u4ef6\uff1a   c<\/pre>\n\n\n\n
git rm<\/h2>\n\n\n\n
\u5c06\u6587\u4ef6\u4ece\u6682\u5b58\u533a\u64a4\u56de\u5230\u5de5\u4f5c\u533a\uff08\u53d8\u6210\u672a\u8ddf\u8e2a\u7684\uff09\u3001\u7136\u540e\u518d\u5220\u9664\u6587\u4ef6\uff1b\u4e5f\u53ef\u4ee5\u76f4\u63a5\u4ece\u6682\u5b58\u533a\u5220\u9664<\/p>\n\n\n\n
[root@wing git_data]# git rm --cached c
rm 'c'
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u65e0\u63d0\u4ea4
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git rm --cached <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
    \u65b0\u6587\u4ef6\uff1a   a
    \u65b0\u6587\u4ef6\uff1a   b
\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6:
  \uff08\u4f7f\u7528 \"git add <\u6587\u4ef6>...\" \u4ee5\u5305\u542b\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
    c
[root@wing git_data]# rm -fr c
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u65e0\u63d0\u4ea4
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git rm --cached <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
    \u65b0\u6587\u4ef6\uff1a   a
    \u65b0\u6587\u4ef6\uff1a   b
[root@wing git_data]# git rm -f b
rm 'b'
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u65e0\u63d0\u4ea4
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git rm --cached <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
    \u65b0\u6587\u4ef6\uff1a   a
[root@wing git_data]# git commit -m \" new a\"    #\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93
[master\uff08\u6839\u63d0\u4ea4\uff09 6ac34be] a
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a
[root@wing git_data]# git status
\u4f4d\u4e8e\u5206\u652f master
\u65e0\u6587\u4ef6\u8981\u63d0\u4ea4\uff0c\u5e72\u51c0\u7684\u5de5\u4f5c\u533a<\/pre>\n\n\n\n
git mv<\/h2>\n\n\n\n
\u5c06\u6682\u5b58\u533a\u91cc\u7684\u6570\u636e\u6539\u540d\u6216\u79fb\u52a8<\/p>\n\n\n\n
1.\u4f7f\u7528mv\u547d\u4ee4\u914d\u5408git
[root@wing git_data]# mv a a.txt
[root@wing git_data]# git status
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u672a\u6682\u5b58\u4ee5\u5907\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git add\/rm <\u6587\u4ef6>...\" \u66f4\u65b0\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
  \uff08\u4f7f\u7528 \"git checkout -- <\u6587\u4ef6>...\" \u4e22\u5f03\u5de5\u4f5c\u533a\u7684\u6539\u52a8\uff09
\u200b
    \u5220\u9664\uff1a     a
\u200b
\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6:
  \uff08\u4f7f\u7528 \"git add <\u6587\u4ef6>...\" \u4ee5\u5305\u542b\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
\u200b
    a.txt
\u200b
\u4fee\u6539\u5c1a\u672a\u52a0\u5165\u63d0\u4ea4\uff08\u4f7f\u7528 \"git add\" \u548c\/\u6216 \"git commit -a\"\uff09
[root@wing git_data]# git rm --cached a ###\u4ece\u6682\u5b58\u533a\u5220\u9664a
rm 'a'
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git reset HEAD <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
\u200b
    \u5220\u9664\uff1a     a
\u200b
\u672a\u8ddf\u8e2a\u7684\u6587\u4ef6:
  \uff08\u4f7f\u7528 \"git add <\u6587\u4ef6>...\" \u4ee5\u5305\u542b\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
\u200b
    a.txt
\u200b
[root@wing git_data]# git add a.txt
[root@wing git_data]# git status
\u4f4d\u4e8e\u5206\u652f master
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git reset HEAD <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
\u200b
    \u91cd\u547d\u540d\uff1a   a -> a.txt   ########\u8bc6\u522b\u5230a\u548ca.txt\u662f\u91cd\u547d\u540d\u7684\u6587\u4ef6
[root@wing git_data]# git commit -m \"rename a to a.txt\"
#\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93
[master 47a267c] a.txt
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename a => a.txt (100%)
\u200b
\u200b
2.\u4f7f\u7528git mv\u76f4\u63a5\u91cd\u547d\u540d
[root@wing git_data]# git mv a.txt a    #\u5c06\u5de5\u4f5c\u533a\u57df\u548c\u6682\u5b58\u533a\u57df\u7684\u6587\u4ef6\u540c\u65f6\u91cd\u547d\u540d
[root@wing git_data]# git status
\u4f4d\u4e8e\u5206\u652f master
\u8981\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git reset HEAD <\u6587\u4ef6>...\" \u4ee5\u53d6\u6d88\u6682\u5b58\uff09
\u200b
    \u91cd\u547d\u540d\uff1a   a.txt -> a
\u200b
[root@wing git_data]# git commit -m \"rename a.txt to a\"
[master a714e37] a
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename a.txt => a (100%)<\/pre>\n\n\n\n
git diff<\/h2>\n\n\n\n
git status \u53ea\u80fd\u67e5\u770b\u533a\u57df\u72b6\u6001\u7684\u4e0d\u540c \uff0c\u4e0d\u80fd\u67e5\u770b\u6587\u4ef6\u5185\u5bb9\u7684\u53d8\u5316\u3002<\/p>\n\n\n\n
git diff \u67e5\u770b\u5185\u5bb9\u7684\u4e0d\u540c<\/p>\n\n\n\n
[root@wing git_data]# git diff #\u6ca1\u6709\u53d8\u5316\u65f6\u4e0d\u663e\u793a\u5185\u5bb9
[root@wing git_data]# vim a
hello
abc
[root@wing git_data]# git add a
[root@wing git_data]# vim a
hello
test
test1
[root@wing git_data]# git diff a    #\u8c03\u6574\u5b8c\u6210\u6587\u4ef6\u540e\uff0c\u5bf9\u6bd4\u672c\u5730\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\u533a\u6587\u4ef6\u7684\u5dee\u5f02
diff --git a\/a b\/a
#git\u683c\u5f0f\u7684diff\u547d\u4ee4\uff0c\u8fdb\u884c\u6bd4\u8f83\u7684\u662fa\u7248\u672c\u7684a\u6587\u4ef6\u548cb\u7248\u672c\u7684a\u6587\u4ef6
index e69de29..ce01362 100644
#\u4e24\u4e2a\u7248\u672c\u7684\u54c8\u5e0c\u503c\uff0c100644\u8868\u793a\u662f\u5bf9\u8c61\u662f\u666e\u901a\u6587\u4ef6\uff0c\u6743\u9650\u662f644
--- a\/a         #---\u8868\u793a\u53d8\u52a8\u524d\uff0c\u4e5f\u5c31\u662fa\u7248\u672c\u7684a\u6587\u4ef6
+++ b\/a         #+++\u8868\u793a\u53d8\u52a8\u540e\uff0c\u4e5f\u5c31\u662fb\u7248\u672c\u7684a\u6587\u4ef6
@@ -1,2 +1,3 @@ ## \u4ee5@\u7b26\u53f7\u5f00\u59cb\u548c\u7ed3\u675f\u201c-1\uff0c2\u201d\u8868\u793a\u524d\u4e00\u4e2a\u6587\u4ef6\u4ece\u7b2c\u4e00\u884c\u5f00\u59cb\u7684\u8fde\u7eed\u4e24\u884c\uff1b\u201c+1\uff0c3\u201d\u8868\u793a\u540e\u4e00\u4e2a\u6587\u4ef6\u7684\u4ece\u7b2c\u4e00\u884c\u5f00\u59cb\u8fde\u7eed\u76843\u884c\uff08-\u8868\u793a\u524d\u4e00\u4e2a\u6587\u4ef6\uff0c+\u8868\u793a\u540e\u4e00\u4e2a\u6587\u4ef6\uff09
hello           
-abc            #-\u8868\u793a\u53bb\u6389\u7684\u5185\u5bb9
+test
+test1      #+\u8868\u793a\u65b0\u589e\u7684\u5185\u5bb9
\u200b
[root@wing git_data]# git diff --cached a   #\u5bf9\u6bd4\u6682\u5b58\u533a\u548c\u672c\u5730\u4ed3\u5e93\u7684\u5dee\u5f02
diff --git a\/a b\/a
index e69de29..0e3af97 100644
--- a\/a
+++ b\/a
@@ -0,0 +1,2 @@
+hello
+abc<\/pre>\n\n\n\n
git commit -m<\/h2>\n\n\n\n
\u5c06\u6682\u5b58\u533a\u5185\u5bb9\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93-m\u540e\u9762\u662f\u63cf\u8ff0\u4fe1\u606f<\/p>\n\n\n\n
[root@wing git_data]# git commit -m \"version2 a\"
[master 8f01c62] version2 a
 1 file changed, 2 insertions(+)
[root@wing git_data]# git diff --cached a
git commit # \u76f8\u5f53\u4e8e\u865a\u62df\u673a\u7684\u955c\u50cf\u3001\u4efb\u4f55\u64cd\u4f5c\u90fd\u88ab\u505a\u4e86\u4e00\u6b21\u5feb\u7167 \uff0c\u53ef\u6062\u590d\u5230\u4efb\u610f\u4e00\u4e2a\u4f4d\u7f6e<\/pre>\n\n\n\n
git commit -am<\/h2>\n\n\n\n
\u5feb\u901f\u63d0\u4ea4\u5230\u672c\u5730\u4ed3\u5e93<\/p>\n\n\n\n
[root@wing git_data]# cat a
haha
[root@wing git_data]# git diff
[root@wing git_data]# echo hello >> a
[root@wing git_data]# git diff
diff --git a\/a b\/a
index 5ad28e2..5c06d49 100644
--- a\/a
+++ b\/a
@@ -1 +1,2 @@
 haha
+hello
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u672a\u6682\u5b58\u4ee5\u5907\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git add <\u6587\u4ef6>...\" \u66f4\u65b0\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
  \uff08\u4f7f\u7528 \"git checkout -- <\u6587\u4ef6>...\" \u4e22\u5f03\u5de5\u4f5c\u533a\u7684\u6539\u52a8\uff09
\u200b
    \u4fee\u6539\uff1a     a
\u200b
\u4fee\u6539\u5c1a\u672a\u52a0\u5165\u63d0\u4ea4\uff08\u4f7f\u7528 \"git add\" \u548c\/\u6216 \"git commit -a\"\uff09
[root@wing git_data]# git add a
[root@wing git_data]# git commit -m \"add hello\"
[master 2add75e] add hello
 1 file changed, 1 insertion(+)
[root@wing git_data]# git diff
######\u5728a\u6587\u4ef6\u4e2d\u6dfb\u52a0hello\u5e76\u63d0\u4ea4\u5230\u4ed3\u5e93
[root@wing git_data]# echo haha >> a
[root@wing git_data]# git commit -am \"add haha\"#\u4e5f\u53ef\u4ee5\u4f7f\u7528-am\u76f4\u63a5\u63d0\u4ea4\u5230\u4ed3\u5e93\uff0c\u76f8\u5f53\u4e8e\u5148git add\u518dgit commit -m\uff0c\u4f46\u5fc5\u987b\u662f\u8ddf\u8e2a\u72b6\u6001\u7684\u6587\u4ef6\uff0c\u53c2\u6570a\u5fc5\u987b\u5728m\u524d\u9762\uff0c\u5426\u5219\u4f1a\u62a5\u9519\uff0c\u65e0\u6cd5\u63d0\u4ea4\u3002
[master f3d6391] add haha
 1 file changed, 1 insertion(+)
[root@wing git_data]# git diff
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u65e0\u6587\u4ef6\u8981\u63d0\u4ea4\uff0c\u5e72\u51c0\u7684\u5de5\u4f5c\u533a
[root@wing git_data]# git log --oneline 
f3d6391 (HEAD -> master) add haha
2add75e add hello<\/pre>\n\n\n\n
git checkout \u2013<\/h2>\n\n\n\n
\u68c0\u51fa\uff0c\u91cd\u5199\u5de5\u4f5c\u533a\u6570\u636e<\/p>\n\n\n\n
[root@wing git_data]# echo haha >> a
[root@wing git_data]# cat a
hello
test
test1
123
haha
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u5c1a\u672a\u6682\u5b58\u4ee5\u5907\u63d0\u4ea4\u7684\u53d8\u66f4\uff1a
  \uff08\u4f7f\u7528 \"git add <\u6587\u4ef6>...\" \u66f4\u65b0\u8981\u63d0\u4ea4\u7684\u5185\u5bb9\uff09
  \uff08\u4f7f\u7528 \"git checkout -- <\u6587\u4ef6>...\" \u4e22\u5f03\u5de5\u4f5c\u533a\u7684\u6539\u52a8\uff09
\u200b
    \u4fee\u6539\uff1a     a
\u200b
\u4fee\u6539\u5c1a\u672a\u52a0\u5165\u63d0\u4ea4\uff08\u4f7f\u7528 \"git add\" \u548c\/\u6216 \"git commit -a\"\uff09
[root@wing git_data]# git  checkout -- a
[root@wing git_data]# git status 
\u4f4d\u4e8e\u5206\u652f master
\u65e0\u6587\u4ef6\u8981\u63d0\u4ea4\uff0c\u5e72\u51c0\u7684\u5de5\u4f5c\u533a
[root@wing git_data]# cat a
hello
test
test1
123<\/pre>\n\n\n\n
git reset HEAD<\/h2>\n\n\n\n
\u672c\u5730\u4ed3\u5e93\u8986\u76d6\u6682\u5b58\u533a\u57df<\/p>\n\n\n\n
[root@wing git_data]# echo \"\" > a   #\u5c06a\u7684\u5185\u5bb9\u6e05\u7a7a
[root@wing git_data]# git add a #\u63d0\u4ea4\u5230\u6682\u5b58\u533a
[root@wing git_data]# git commit -m \"test head\" #\u63d0\u4ea4\u5230\u4ed3\u5e93
[master dd7925f] test head
 1 file changed, 1 insertion(+), 1 deletion(-)
[root@wing git_data]# echo haha > a #\u6dfb\u52a0\u5185\u5bb9\u5230a
[root@wing git_data]# git add a #\u63d0\u4ea4\u5230\u6682\u5b58\u533a
[root@wing git_data]# git diff a    #\u786e\u8ba4\u6ca1\u6709\u5dee\u5f02
[root@wing git_data]# git reset HEAD a  #\u7528\u672c\u5730\u4ed3\u5e93\u7684\u6570\u636e\u5c06\u6682\u5b58\u533a\u6570\u636e\u8986\u76d6
\u91cd\u7f6e\u540e\u53d6\u6d88\u6682\u5b58\u7684\u53d8\u66f4\uff1a
M   a
[root@wing git_data]# git diff a    #\u6bd4\u8f83\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u6570\u636e\u5dee\u5f02
diff --git a\/a b\/a
index 8b13789..5ad28e2 100644
--- a\/a
+++ b\/a
@@ -1 +1 @@
-
+haha<\/pre>\n\n\n\n
git reset --hard \u54c8\u5e0c\u5934\u540d<\/h2>\n\n\n\n
Git\u670d\u52a1\u7a0b\u5e8f\u4e2d\u6709\u4e00\u4e2a\u53eb\u505aHEAD\u7684\u7248\u672c\u6307\u9488\uff0c\u5f53\u7528\u6237\u7533\u8bf7\u8fd8\u539f\u6570\u636e\u65f6\uff0c\u5176\u5b9e\u5c31\u662f\u5c06HEAD\u6307\u9488\u6307\u5411\u5230\u67d0\u4e2a\u7279\u5b9a\u7684\u63d0\u4ea4\u7248\u672c\uff0c\u4f46\u662f\u56e0\u4e3aGit\u662f\u5206\u5e03\u5f0f\u7248\u672c\u63a7\u5236\u7cfb\u7edf\uff0c\u4e3a\u4e86\u907f\u514d\u5386\u53f2\u8bb0\u5f55\u51b2\u7a81\uff0c\u6545\u4f7f\u7528\u4e86SHA\u20101\u8ba1\u7b97\u51fa\u5341\u516d\u8fdb\u5236\u7684\u54c8\u5e0c\u5b57\u4e32\u6765\u533a\u5206\u6bcf\u4e2a\u63d0\u4ea4\u7248\u672c\uff0c\u53e6\u5916\u9ed8\u8ba4\u7684HEAD\u7248\u672c\u6307\u9488\u4f1a\u6307\u5411\u5230\u6700\u8fd1\u7684\u4e00\u6b21\u63d0\u4ea4\u7248\u672c\u8bb0\u5f55\uff0c\uff0c\u6ce8\u610f\u6062\u590d\u7248\u672c\u540e\u4ee3\u8868\u7684\u662f\u5728\u8fd9\u4e2a\u7248\u672c\u4e4b\u524d\u7684\u5185\u5bb9\u5168\u5728\uff08\u5305\u62ec\u5de5\u4f5c\u76ee\u5f55\u548c\u6682\u5b58\uff09\uff0c\u672c\u7248\u672c\u4e4b\u540e\u7684\u90fd\u6ca1\u4e86<\/p>\n\n\n\n
[root@wing git_data]# git log --oneline 
f3d6391 (HEAD -> master) add haha
2add75e add hello
ff77333 aaa
dd7925f test head
e2e2131 head test
644d678 test head
326e57a v2 a
8f01c62 version2 a
a714e37 a
47a267c a.txt
6ac34be a
[root@wing git_data]# git reset --hard e2e2
HEAD \u73b0\u5728\u4f4d\u4e8e e2e2131 head test
[root@wing git_data]# git log --oneline 
2add75e (HEAD -> master) add hello
ff77333 aaa
dd7925f test head
e2e2131 head test
644d678 test head
326e57a v2 a
8f01c62 version2 a
a714e37 a
47a267c a.txt
6ac34be a
[root@wing git_data]# cat a
test
\u200b
\u200b
#git reset --mixed\uff1a\u6b64\u4e3a\u9ed8\u8ba4\u65b9\u5f0f\uff0c\u4e0d\u5e26\u4efb\u4f55\u53c2\u6570\u7684git reset\uff0c\u5373\u662f\u8fd9\u79cd\u65b9\u5f0f\uff0c\u79fb\u52a8head\u6307\u9488\uff0c\u6539\u53d8\u6682\u5b58\u533a\u5185\u5bb9\uff0c\u4f46\u4e0d\u4f1a\u6539\u53d8\u5de5\u4f5c\u533a
#git reset  --soft\uff1a\u56de\u9000\u5230\u67d0\u4e2a\u7248\u672c\uff0c\u4ec5\u79fb\u52a8\u5f53\u524dHead\u6307\u9488\uff0c\u4e0d\u4f1a\u6539\u53d8\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u7684\u5185\u5bb9  
#git reset --hard\uff1a\u5f7b\u5e95\u56de\u9000\u5230\u67d0\u4e2a\u7248\u672c\uff0chead\u6307\u9488\u3001\u5de5\u4f5c\u533a\u548c\u6682\u5b58\u533a\u5185\u5bb9\u5168\u90e8\u6539\u53d8
\u200b
--soft\u7528\u5904\u4e0d\u662f\u5f88\u591a\uff1b\u5f53\u6267\u884cgit commit\u4e4b\u540e\u60f3\u64a4\u56de\uff0c\u4f46\u8fd8\u4e0d\u60f3\u8986\u76d6\u5de5\u4f5c\u533a\u5185\u5bb9\u65f6\uff0c\u4f7f\u7528--mixed\uff1b\u5f53\u60f3\u5b8c\u5168\u56de\u6eda\u65f6\uff0c\u4f7f\u7528--hard\u6765\u8986\u76d6\u5de5\u4f5c\u533a\u3002<\/pre>\n\n\n\n
git reflog<\/h2>\n\n\n\n
[root@wing git_data]# cat a     #\u67e5\u770b\u6587\u4ef6\u5185\u5bb9\uff0c\u53d1\u73b0\u6062\u590d\u9519\u4e86\uff0c\u672c\u6765\u662f\u60f3\u6062\u590d\u5230\u201cadd haha\u201d\u8fd9\u4e2a\u4f4d\u7f6e\u7684
test
[root@wing git_data]# git log --oneline #\u4f7f\u7528log\u67e5\u770b\uff0c\u53d1\u73b0\u6ca1\u6709\u201cadd haha\u201d\u7684\u5185\u5bb9\u4e86
e2e2131 (HEAD -> master) head test
644d678 test head
326e57a v2 a
8f01c62 version2 a
a714e37 a
47a267c a.txt
6ac34be a
#\u539f\u56e0\u5f88\u7b80\u5355\uff0c\u56e0\u4e3a\u6211\u4eec\u5f53\u524d\u7684\u5de5\u4f5c\u7248\u672c\u662f\u5386\u53f2\u7684\u4e00\u4e2a\u63d0\u4ea4\u70b9\uff0c\u8fd9\u4e2a\u5386\u53f2\u63d0\u4ea4\u70b9\u8fd8\u6ca1\u6709\u53d1\u751f\u8fc7add bbb\u66f4\u65b0\u8bb0\u5f55\uff0c\u6240\u4ee5\u5f53\u7136\u5c31\u770b\u4e0d\u5230\u4e86 \uff0c\u8981\u662f\u60f3\u201d\u8fd8\u539f\u5230\u672a\u6765\u201d\u7684\u5386\u53f2\u66f4\u65b0\u70b9 \uff0c\u53ef\u4ee5\u7528git reflog\u547d\u4ee4\u6765\u67e5\u770b\u6240\u6709\u7684\u5386\u53f2\u8bb0\u5f55
[root@wing git_data]# git reflog 
# \u4f7f\u7528git reflog \u53ef\u67e5\u770b\u603b\u5386\u53f2\u5185\u5bb9\uff08\u6ce8\u610f\u8fd9\u91cc\u9762\u4e5f\u662f\u6240\u6709\u7684commit\u4e4b\u540e\uff0c\u4e5f\u5c31\u662f\u653e\u5230\u672c\u5730\u4ed3\u540e\u7684\u8bb0\u5f55\uff09\u518d\u7ed3\u5408git reset --hard \u54c8\u5e0c\u5934\u90e8\u6062\u590d\u7248\u672c\u5feb\u7167 \uff0c\u6240\u6709\u7684\u6570\u636e\u6839\u672c\u5c31\u4e0d\u53ef\u80fd\u4e22\u5931\uff0c\u968f\u4fbf\u5220\u9664\uff0c\u968f\u4fbf\u6062\u590d\uff08\u524d\u63d0\u662f\u5df2\u63d0\u4ea4\u4ed3\u5e93\u7684\u7684\u5185\u5bb9\uff09
\u200b
e2e2131 (HEAD -> master) HEAD@{0}: reset: moving to e2e2
2add75e HEAD@{1}: reset: moving to 2add75e
f3d6391 HEAD@{2}: commit: add haha
2add75e HEAD@{3}: commit: add hello
ff77333 HEAD@{4}: commit: aaa
dd7925f HEAD@{5}: commit: test head
e2e2131 (HEAD -> master) HEAD@{6}: commit: head test
644d678 HEAD@{7}: commit: test head
326e57a HEAD@{8}: commit: v2 a
8f01c62 HEAD@{9}: commit: version2 a
a714e37 HEAD@{10}: commit: a
47a267c HEAD@{11}: commit: a.txt
6ac34be HEAD@{12}: commit (initial): a
[root@wing git_data]# git reset --hard f3d6 #\u4f7f\u7528reset\u6062\u590d\u5230\u201cadd haha\u201d\u7684\u7248\u672c
HEAD \u73b0\u5728\u4f4d\u4e8e f3d6391 add haha
[root@wing git_data]# cat a
haha
hello
haha<\/pre>\n","protected":false},"excerpt":{"rendered":"
git status\/git status -s \u67e5\u770b\u72b6\u6001 [root@wing git_data]# git […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[26],"tags":[],"class_list":["post-338","post","type-post","status-publish","format-standard","hentry","category-devops"],"_links":{"self":[{"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=\/wp\/v2\/posts\/338","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=338"}],"version-history":[{"count":1,"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=\/wp\/v2\/posts\/338\/revisions"}],"predecessor-version":[{"id":339,"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=\/wp\/v2\/posts\/338\/revisions\/339"}],"wp:attachment":[{"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=338"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=338"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.xxiaoteng.cn\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=338"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}