pborenstein.dev

Dot Dot notation


OK, seriously? What is it with the dot notation in git? Given this repo:

             master
               |
C1---C2---C5---C6
      \
       C3---C4
            |
          topic

How does git log master..topic mean to display commits C3 and C4?

Let’s see if we can make things simpler.

A simple case

Imagine a repo with two branches, master and topic. The topic branch branches off of master, but there are no new commits on master:

             master
               |
L1---L2---L3---L4---L5---L6
                         |
                       topic

The git log output looks like this:

$ git log --oneline --all --graph --decorate
* 0c1d724 (topic) L6
* 5d4cdb5 L5
* ca8cf0a (HEAD -> master) L4
* 019e663 L3
* b1ea04d L2
* 83fd5ca L1

What should we expect the output of git log master..topic to be?

$ git log --oneline --graph --decorate master..topic
* 0c1d724 (topic) L6
* 5d4cdb5 L5

That looks right. The commits from master to topic are L5 and L6 (not including the L6 commit at master).

OK. What if we reverse the order of the commits?

$ git log --oneline --graph --decorate topic..master

Order matters. The dots seem to denote the passage of time. So master..topic means:

The commits from master to topic.(1)

Then it makes sense that topic..master produces no output because

the commits from topic to master

is nonsensical since topic comes after master.

Now with branches

Let’s go back to our first repo:

             master
               |
C1---C2---C5---C6
      \
       C3---C4
            |
          topic

What does git log master..topic, mean in this case?
Commits from master to topic doesn’t make a lot of sense here.

It turns out that master..topic is
shorthand
for

^master topic

See, git log doesn’t work on sequences of commits. It works on sets of commits. It’s right there in the documentation.(2)

History-traversing commands, such as git log, operate on a set of commits, not just a single commit.

For these commands, specifying a single revision, using the notation described in the previous section, means the set of commits reachable from the given commit.

A commit’s reachable set is the commit itself and the commits in its ancestry chain.

So master..topic means ^master topic, which means:

All the commits on topic: C1---C2---C3---C4

Excluding all the commits on master: C1---C2---C5---C6

Which leaves: C3---C4

$ git log --oneline --graph --decorate master..topic
* 703d475 (HEAD -> topic) C4
* 3ffdcab C3