##// END OF EJS Templates
Merge pull request #4016 from takluyver/IPython-start-funcs...
Merge pull request #4016 from takluyver/IPython-start-funcs Fix IPython.start_* functions start_kernel() didn't work at all (#4005), and I found while investigating that passing user_ns to either start_ipython() or start_kernel() had no effect, because the Application wasn't passing it on to the Shell. This is a simple fix for the most pressing issues. We should think about any other parameters that we want to be passed through from our top level API, e.g. possibly user_module. closes #4005

File last commit:

r11729:5cc34183
r12189:d3e2f732 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).