Lines Matching +full:two +full:-

1 .. SPDX-License-Identifier: GPL-2.0
4 Handling messy pull-request diffstats
7 Subsystem maintainers routinely use ``git request-pull`` as part of the
17 .. _Linus1: https://lore.kernel.org/lkml/CAHk-[email protected]…
18 .. _Linus2: https://lore.kernel.org/lkml/CAHk-[email protected]…
23   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
25 If one wants to see what has changed between two points, a command like
28   $ git diff --stat --summary vN-rc2..vN-rc3
30 Here, there are two clear points in the history; Git will essentially
38   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
40                           +-- c1 --- c2 --- ... --- cN
43 the mainline branch (let's call it "linus") and cN, there are still two
45 generated with ``git request-pull`` will also be as expected.  But now
48   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
50                 |         +-- c1 --- c2 --- ... --- cN
52                 +-- x1 --- x2 --- x3
54 Our maintainer has created one branch at vN-rc1 and another at vN-rc2; the
55 two were then subsequently merged into c2.  Now a pull request generated
59 What is happening here is that there are no longer two clear end points for
61 started in two different places; to generate the diffstat, ``git diff``
63 starts at vN-rc1, it may end up including all of the changes between there
64 and the second origin end point (vN-rc2), which is certainly not what our
73 upstream is a well-known way to get a grumpy response.
80   ... vM --- vN-rc1 --- vN-rc2 --- vN-rc3 --- ... --- vN-rc7 --- vN
82                 |         +-- c1 --- c2 --- ... --- cN           |
84                 +-- x1 --- x2 --- x3                +------------+-- TEMP
91   $ git diff -C --stat --summary linus..TEMP