##// END OF EJS Templates
use QSocketNotifier, not poll...
use QSocketNotifier, not poll avoids having to disable App Nap outright. Also use appnope context manager to disable App Nap on OS X 10.9 while processing events. Adds IPKernel._darwin_app_nap flag, so that working with App Nap can be disabled, in case appnope causes problems for some. App Nap is just disabled outright on wx.

File last commit:

r11729:5cc34183
r13583:72366b31
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).