diff --git a/demos/git.html b/demos/git.html index 945b91b2c0..8384fcdbba 100644 --- a/demos/git.html +++ b/demos/git.html @@ -73,6 +73,33 @@

Continuous development graph

checkout main merge develop +

Merge feature to advanced main graph

+
+    ---
+    title: Merge feature to advanced main (left-to-right)
+    ---
+    gitGraph LR:
+    commit
+    branch newbranch
+    checkout newbranch
+    commit
+    checkout main
+    commit
+    merge newbranch
+    
+
+    ---
+    title: Merge feature to advanced main (top-to-bottom)
+    ---
+    gitGraph TB:
+    commit
+    branch newbranch
+    checkout newbranch
+    commit
+    checkout main
+    commit
+    merge newbranch
+    

Two-way merges

     ---
@@ -236,46 +263,54 @@ 

Merge from main graph

commit merge main
-

Three branches graph

+

Three branches and a cherry-pick from each graph

     ---
-    title: Three branches (left-to-right)
+    title: Three branches and a cherry-pick from each (left-to-right)
     ---
     gitGraph LR:
-    commit
+    commit id: "ZERO"
     branch develop
-    checkout develop
-    commit
-    branch feature
-    checkout feature
-    commit
+    commit id:"A"
     checkout main
-    merge feature id:"Direct to main"
+    commit id:"ONE"
     checkout develop
-    merge feature
-    commit
+    commit id:"B"
+    branch featureA
+    commit id:"FIX"
+    commit id: "FIX-2"
     checkout main
-    merge develop
+    commit id:"TWO"
+    cherry-pick id:"A"
+    commit id:"THREE"
+    cherry-pick id:"FIX"
+    checkout develop
+    commit id:"C"
+    merge featureA
     
     ---
-    title: Three branches (top-to-bottom)
+    title: Three branches and a cherry-pick from each (top-to-bottom)
     ---
     gitGraph TB:
-    commit
+    commit id: "ZERO"
     branch develop
-    checkout develop
-    commit
-    branch feature
-    checkout feature
-    commit
+    commit id:"A"
     checkout main
-    merge feature id:"Direct to main"
+    commit id:"ONE"
     checkout develop
-    merge feature
-    commit
+    commit id:"B"
+    branch featureA
+    commit id:"FIX"
+    commit id: "FIX-2"
     checkout main
-    merge develop
+    commit id:"TWO"
+    cherry-pick id:"A"
+    commit id:"THREE"
+    cherry-pick id:"FIX"
+    checkout develop
+    commit id:"C"
+    merge featureA