File: dot2_dot3.rst

package info (click to toggle)
matplotlib 3.3.4-1
  • links: PTS, VCS
  • area: main
  • in suites: bullseye
  • size: 78,264 kB
  • sloc: python: 123,969; cpp: 57,655; ansic: 29,431; objc: 2,244; javascript: 757; makefile: 163; sh: 111
file content (28 lines) | stat: -rw-r--r-- 681 bytes parent folder | download | duplicates (30)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
.. _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).