Skip to content

Commit a980930

Browse files
authored
cheat sheet: Tweak the transplanted commit annotations (#2078)
Made a couple of tweaks to #2076 that I think will make things clearer: 1. Make the D' boxes a bit wider, so it doesn't look so cramped 2. Remove the "prime" from the stacked D and E The idea of the "prime" 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. I think this makes sense. 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 could actually mean).
2 parents 1df6780 + 0ddfd12 commit a980930

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
@@ -514,7 +514,7 @@ <h3>Combine with squash merge:</h3>
514514
C [label="C", pos="2,1!"];
515515
D [label="D", color="#f14e32", pos="2,0!"];
516516
E [label="E", color="#f14e32", pos="3,0!"];
517-
S [label="D&#x2032;\nE&#x2032;", color="#f14e32", pos="3,1!", width=0.6, height=0.8];
517+
S [label="D\nE", color="#f14e32", pos="3,1!", width=0.6, height=0.9];
518518

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

0 commit comments

Comments
 (0)