From 386cfaeab5b54957c151bf32a614357305b177c1 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Wed, 17 Sep 2025 00:57:12 +0200 Subject: [PATCH] cheat sheet: mark transplanted commits with prime similar to how manpages git-rebase(1) and git-cherry-pick(1) indicate them --- content/cheat-sheet/_index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/cheat-sheet/_index.html b/content/cheat-sheet/_index.html index c55f941d80..26be1d20ca 100644 --- a/content/cheat-sheet/_index.html +++ b/content/cheat-sheet/_index.html @@ -344,8 +344,8 @@

Combine with rebase:

D [label="D", style="dashed", color="#f14e32", pos="2,0!"]; E [label="E", style="dashed", color="#f14e32", pos="3,0!"]; - D2 [label="D", color="#f14e32", pos="3,1!"]; - E2 [label="E", color="#f14e32", pos="4,1!"]; + D2 [label="D′", color="#f14e32", pos="3,1!"]; + E2 [label="E′", color="#f14e32", pos="4,1!"]; main_label [label="main", shape=plaintext, pos="2,2!", fixedsize=false]; @@ -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.8]; main_label [label="main", shape=plaintext, pos="5,1!", fixedsize=false]; main_label -> S [dir=forward]; @@ -655,7 +655,7 @@

Copy one commit onto the current branch:

A [label="A", pos="0,1!"]; B [label="B", pos="1,1!"]; C [label="C", pos="2,1!"]; - D2 [label="D", color="#f14e32", pos="3,1!"]; + D2 [label="D′", color="#f14e32", pos="3,1!"]; D [label="D", color="#f14e32", pos="2,0!"]; E [label="E", pos="3,0!"];