Skip to content

Commit 0ddfd12

Browse files
committed
cheat sheet: tweak the transplanted commit annotations
Remove the "prime" from the stacked D and E because I think it's confusing. The idea of the D' annotation is that D is somehow a shorthand for a commit ID, and D' is meant to suggest that the transplanted commit has a different commit ID. But with the stacked D and E, the two D and E being grouped together are already doing the work to show that the new commit is modified in some way, so we don't need to add the "prime" (and it's not clear to me what the prime would mean)
1 parent 96f89d8 commit 0ddfd12

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

content/cheat-sheet/_index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ <h3>Combine with squash merge:</h3>
510510
C [label="C", pos="2,1!"];
511511
D [label="D", color="#f14e32", pos="2,0!"];
512512
E [label="E", color="#f14e32", pos="3,0!"];
513-
S [label="D&#x2032;\nE&#x2032;", color="#f14e32", pos="3,1!", width=0.6, height=0.8];
513+
S [label="D\nE", color="#f14e32", pos="3,1!", width=0.6, height=0.9];
514514

515515
main_label [label="main", shape=plaintext, pos="5,1!", fixedsize=false];
516516
main_label -> S [dir=forward];

0 commit comments

Comments
 (0)