LoginSignup
34
33

More than 5 years have passed since last update.

gitの ".." と "..." の意味がコマンドで異なるらしいので図解した

Last updated at Posted at 2014-02-28

いわゆるダブルドットとトリプルドット。

履歴が1本

図解

all01.png

コマンド

git log

$ git log master..test
C

$ git log master...test
C

$ git log test..master

$ git log test...master
C

git diff

$ git diff master..test
+C
 B
 A

$ git diff master...test
+C
 B
 A

$ git diff test..master
-C
 B
 A

$ git difftest...master

履歴が分岐

図解

all02.png

コマンド

git log

$ git log master..test  --> git log ^master test
C

$ git log master...test --> git log master test ^B
D
C

$ git log test..master --> git log ^test master
D

$ git log test...master --> git log test master ^B
D
C

git diff

$ git diff master..test  --> git diff master test
-D
+C
 B
 A

$ git diff master...test --> git diff B test
+C
 B
 A

$ git diff test..master  --> git diff test master
-C
+D
 B
 A

$ git diff test...master --> git diff B master
+D
 B
 A

まとめ

  • git logは範囲を指定
  • git diffは2点を指定
34
33
0

Register as a new user and use Qiita more conveniently

  1. You get articles that match your needs
  2. You can efficiently read back useful information
  3. You can use dark theme
What you can do with signing up
34
33