What are the differences between double-dot “..” a

问题:

Some Git commands take commit ranges and one valid syntax is to separate two commit names with two dots .., and another syntax uses three dots ....

What are the differences between the two?

回答1:

It depends on whether you\'re using a log command or a diff command. In the log case, it\'s in the man git-rev-parse documentation:

To exclude commits reachable from a commit, a prefix ^ notation is used. E.g. ^r1 r2 means commits reachable from r2 but exclude the ones reachable from r1.

This set operation appears so often that there is a shorthand for it. When you have two commits r1 and r2 (named according to the syntax explained in SPECIFYING REVISIONS above), you can ask for commits that are reachable from r2 excluding those that are reachable from r1 by \"^r1 r2\" and it can be written as \"r1..r2\".

A similar notation \"r1...r2\" is called symmetric difference of r1 and r2 and is defined as \"r1 r2 --not $(git merge-base --all r1 r2)\". It is the set of commits that are reachable from either one of r1 or r2 but not from both.

Which basically means that you\'ll get all commits that are in either of the two branches, but not in both.

In the diff case, it\'s in the man git-diff documentation:

  git diff [--options] <commit>...<commit> [--] [<path>...]

      This form is to view the changes on the branch containing and up to
      the second <commit>, starting at a common ancestor of both
      <commit>. \"git diff A...B\" is equivalent to \"git diff
      $(git-merge-base A B) B\". You can omit any one of <commit>, which
      has the same effect as using HEAD instead.

Which is a bit fuzzy. Basically it means it shows only the differences in that branch compared to another branch: it looks for the last common commit with the first committish you gave it, and then diffs the second committish to that. It\'s an easy way to see what changes are made in that branch, compared to this branch, without taking notice of changes in this branch only.

The .. is somewhat simpler: In the git-diff case, it\'s the same as a git diff A B and just diffs A against B. In the log case, it shows all commits that are in B but not in A.

回答2:

Using Commit Ranges with Git Log

When you\'re using commit ranges like .. and ... with git log, the difference between them is that, for branches A and B,

git log A..B

will show you all of the commits that B has that A doesn\'t have, while

git log A...B

will show you both the commits that A has and that B doesn\'t have, and the commits that B has that A doesn\'t have, or in other words, it will filter out all of the commits that both A and B share, thus only showing the commits that they don\'t both share.

Visualization with Venn Diagrams & Commit Trees

Here is a visual representation of git log A..B. The commits that branch B contains that don\'t exist in A is what is returned by the commit range, and is highlighted in red in the Venn diagram, and circled in blue in the commit tree:

 

These are the diagrams for git log A...B. Notice that the commits that are shared by both branches are not returned by the command:

 

Making the Triple-Dot Commit Range ... More Useful

You can make the triple-dot commit range ... more useful in a log command by using the --left-right option to show which commits belong to which branch:

$ git log --oneline --decorate --left-right --graph master...origin/master
< 1794bee (HEAD, master) Derp some more
> 6e6ce69 (origin/master, origin/HEAD) Add hello.txt

In the above output, you\'ll see the commits that belong to master are prefixed with <, while commits that belong to origin/master are prefixed with >.

Using Commit Ranges with Git Diff

Someday I might add my own explanation for how the commit ranges work with git diff, but for now, you might want to check out What are the differences between double-dot ".." and triple-dot "..." in Git diff commit ranges?.

See Also

• Pro Git § 6.1 Git Tools - Revision Selection - Commit Ranges