##// END OF EJS Templates
use notebook which has an image in it for the test
use notebook which has an image in it for the test

File last commit:

r11729:5cc34183
r11993:aba4effb
Show More
dot2_dot3.rst
28 lines | 681 B | text/x-rst | RstLexer
Fernando Perez
Add Git workflow docs from Gitwash....
r2599 .. _dot2-dot3:
========================================
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).