##// END OF EJS Templates
Merge pull request #3911 from minrk/cm-ipython...
Merge pull request #3911 from minrk/cm-ipython explicitly load python mode before IPython mode

File last commit:

r11729:5cc34183
r11989:3f3c4ab5 merge
Show More
dot2_dot3.rst
28 lines | 681 B | text/x-rst | RstLexer

Two and three dots in difference specs

Thanks to Yarik Halchenko for this explanation.

Imagine a series of commits A, B, C, D... Imagine that there are two branches, topic and master. You branched topic off master when master was at commit 'E'. The graph of the commits looks like this:

     A---B---C topic
     /
D---E---F---G master

Then:

git diff master..topic

will output the difference from G to C (i.e. with effects of F and G), while:

git diff master...topic

would output just differences in the topic branch (i.e. only A, B, and C).