摘錄自本人《Git聊天入門》的章節(jié): HEAD^ 和 HEAD~ 是啥
^
和~
是2個(gè)很有意思的字符序厉,配合使用可表示祖宗十八代蛔糯。任你給一個(gè)節(jié)點(diǎn)(HEAD 或 哈希值),都能順藤摸瓜,找到其祖先是誰寥茫。
網(wǎng)友通常這么解釋:
-
^
:表示第幾個(gè)父/母親 —— git存在多個(gè)分支合并的情況,所以不只有1對(duì)父母親 -
~
:表示向上找第幾代相艇,相當(dāng)于連續(xù)幾個(gè)^
比如有這樣一個(gè)庫:
b1(HEAD)
|
C4 ------ C6
/
--- C5
自己: C6 = HEAD^0 = HEAD~0 = C6^0 = C6~0
父親: C4 = HEAD^1 = HEAD^ = HEAD~1 = HEAD~ = C6^1 = C6^ = C6~1 = C6~
母親: C5 = HEAD^2 = C6^2
我經(jīng)過反復(fù)琢磨唯笙,給出另外一種更形象的解釋:
-
^x
:抬頭走1步,入x號(hào)岔路口找默。 -
~y
:低頭走y步艇劫,無視岔路口。
所以:^^
: 抬頭2步惩激,都是1號(hào)口店煞;^2^
:抬頭走2步,第1步入2號(hào)口风钻;^^3^
:抬頭走3步顷蟀,第2步入3號(hào)口;~^~
:低頭1步骡技,抬頭1步鸣个,再低頭1步;~2^~^2
:低頭走2步,抬頭1步如1號(hào)口毛萌,再低頭1步苟弛,再抬頭1步如2號(hào)口 …… 怎么樣?用抬頭走阁将、低頭走理論是不是一下就理解了膏秫?心情舒暢吧。
這樣做盅,我們就可以方便的得到:
爺爺:HEAD^^ = HEAD^~ = HEAD~2
奶奶:HEAD^^2
姥爺:HEAD^2^ = HEAD^2~
姥姥:HEAD^2^2
……
^
和 ~
可用于git的多種操作:log缤削、diff、show吹榴、checkout……
實(shí)際操作一下:
kevin@:linux.git$ git log --oneline -n20 --graph
* c11fb13a117e (HEAD -> master, tuna/master, kernel/master, github/master) Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
|\
| * 3ed224e273ac HID: logitech-dj: Fix 064d:c52f receiver support
| * f9482dabfd16 Revert "HID: core: Call request_module before doing device_add"
| * e0b7f9bc0246 Revert "HID: core: Do not call request_module() in async context"
| * 15fc1b5c8612 Revert "HID: Increase maximum report size allowed by hid_field_extract()"
| * eb6964fa6509 HID: i2c-hid: add iBall Aer3 to descriptor override
* | b076173a309e Merge tag 'selinux-pr-20190612' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
|\ \
| * | fec6375320c6 selinux: fix a missing-check bug in selinux_sb_eat_lsm_opts()
| * | e2e0e09758a6 | 2019-06-12 21:28:21 +0800 | Gen Zhang selinux: fix a missing-check bug in selinux_add_mnt_opt( )
| * | aff7ed485168 | 2019-06-11 10:07:19 +0200 | Ondrej Mosnacek selinux: log raw contexts as untrusted strings
* | | 35110e38e6c5 | 2019-06-12 05:57:05 -1000 | Linus Torvalds Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
自己:
kevin@:linux.git$ git log --oneline -n1 HEAD^0
c11fb13a117e (HEAD -> master, tuna/master, kernel/master, github/master) Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
kevin@:linux.git$ git log --oneline -n1 HEAD~0
c11fb13a117e (HEAD -> master, tuna/master, kernel/master, github/master) Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
父親:
kevin@:linux.git$ git log --oneline -n1 HEAD^
b076173a309e Merge tag 'selinux-pr-20190612' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
kevin@:linux.git$ git log --oneline -n1 HEAD^1
b076173a309e Merge tag 'selinux-pr-20190612' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
kevin@:linux.git$ git log --oneline -n1 HEAD~
b076173a309e Merge tag 'selinux-pr-20190612' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
kevin@:linux.git$ git log --oneline -n1 HEAD~1
b076173a309e Merge tag 'selinux-pr-20190612' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
爺爺:
kevin@:linux.git$ git log --oneline -n1 HEAD^^
35110e38e6c5 Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
kevin@:linux.git$ git log --oneline -n1 HEAD^~
35110e38e6c5 Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
kevin@:linux.git$ git log --oneline -n1 HEAD~2
35110e38e6c5 Merge tag 'media/v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
奶奶
kevin@:linux.git$ git log --oneline -n1 HEAD^^2
fec6375320c6 selinux: fix a missing-check bug in selinux_sb_eat_lsm_opts()
母親:
kevin@:linux.git$ git log --oneline -n1 HEAD^2
3ed224e273ac HID: logitech-dj: Fix 064d:c52f receiver support
姥爺:
kevin@:linux.git$ git log --oneline -n1 HEAD^2~
f9482dabfd16 Revert "HID: core: Call request_module before doing device_add"
總體來說:找父親一族要方便些亭敢,找母親一族要麻煩些。