##// END OF EJS Templates
Restored major default completer functionality (cd, import, run)....
Restored major default completer functionality (cd, import, run). These completers had been put in quarantine, I've done a substantial amount of cleanup and restructuring of this code and put it in core.completerlib. There's still a lot to improve there (in particular adding unittests) but at least now it's much more readable and cleanly structured. This gives us back completion for cd, import and run that 0.10 had and which we had lost since the restructuring when the code was quarantined. Also removed the ipy_stock_completers file, the loading of these completers is now done in the init_completer method.

File last commit:

r2599:aa4014be
r2959:4a4ea220
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).