From 0ddfd12e5d8244f383668aa05947d216d6193d1d Mon Sep 17 00:00:00 2001 From: Julia Evans Date: Wed, 17 Sep 2025 09:13:57 -0400 Subject: [PATCH] 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) --- content/cheat-sheet/_index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/cheat-sheet/_index.html b/content/cheat-sheet/_index.html index 9703b99adf..1fdd4943bb 100644 --- a/content/cheat-sheet/_index.html +++ b/content/cheat-sheet/_index.html @@ -510,7 +510,7 @@

Combine with squash merge:

C [label="C", pos="2,1!"]; D [label="D", color="#f14e32", pos="2,0!"]; E [label="E", color="#f14e32", pos="3,0!"]; - S [label="D′\nE′", color="#f14e32", pos="3,1!", width=0.6, height=0.8]; + S [label="D\nE", color="#f14e32", pos="3,1!", width=0.6, height=0.9]; main_label [label="main", shape=plaintext, pos="5,1!", fixedsize=false]; main_label -> S [dir=forward];