##// END OF EJS Templates
add deprecation warning for renamed engine/controller_launcher config...
add deprecation warning for renamed engine/controller_launcher config These have been renamed to add _class, which makes it clearer that they are class names/paths. This allows 0.11-style specification of the names to work, but with a warning that the old name is deprecated.

File last commit:

r2599:aa4014be
r5182:79c1f62f
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).