Align diverged graphs with the in-training examples

images/integration/diverged-history-merge.gv

@@ -19,14 +19,16 @@ digraph Git {
   node [style="rounded,filled"
         fillcolor="#f0efe8"]
   node [group=master]
-  A -> B -> E
-  E -> F [weight=2]
-  // X is invisible and used for alignment only.
+  A -> B -> F
+  F -> G [weight=2]
+  // X and Y are invisible and used for alignment only.
   X [label="" fillcolor=transparent]
-  E->X [style=invis]
-  X->F [style=invis]
+  Y [label="" fillcolor=transparent]
+  F->X [style=invis]
+  X->Y [style=invis]
+  Y->G [style=invis]
   node [group=topic]
-  B -> C -> D -> F
+  B -> C -> D -> E -> G
 
   node [style="filled"
         fontcolor="#ffffff"
@@ -37,13 +39,13 @@ digraph Git {
     style=invis
     {
       rank=same
-      F -> master -> HEAD
+      G -> master -> HEAD
     }
   }
 
   // No cluster draws label below.
   {
     rank=same
-    D -> topic
+    E -> topic
   }
 }

images/integration/diverged-history-rebase.gv

@@ -20,7 +20,8 @@ digraph Git {
   node [group=master]
   Cr [label="C'"]
   Dr [label="D'"]
-  A -> B -> E -> Cr -> Dr
+  Er [label="E'"]
+  A -> B -> F -> Cr -> Dr -> Er
 
   node [style="filled"
         fontcolor="#ffffff"
@@ -31,15 +32,15 @@ digraph Git {
     color=invis
     {
       rank=same
-      Dr -> topic -> HEAD
+      Er -> topic -> HEAD
     }
   }
 
   subgraph cluster_master {
     color=invis
     {
       rank=same
-      E -> master
+      F -> master
     }
   }
 
@@ -48,5 +49,5 @@ digraph Git {
         fillcolor="#f0efe864"
         fontcolor="#7f7f7f"]
   edge [color="#8f8a8364"]
-  B -> C -> D
+  B -> C -> D -> E
 }