##// END OF EJS Templates
Merge pull request #1815 from ellisonbg/nbsavebug...
Merge pull request #1815 from ellisonbg/nbsavebug Make : invalid in filenames in the Notebook JS code. This only prevents : in the filenames on the JavaScript side of things. Handling this on the server side will be a separate issue that is related to other open issue. I will update those to reflect this. closes #1781

File last commit:

r2599:aa4014be
r7323:66a567b7 merge
Show More
dot2_dot3.txt
28 lines | 681 B | text/plain | TextLexer
.. _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).