diff --git a/demos/git.html b/demos/git.html index 8384fcdbb..92e0e6863 100644 --- a/demos/git.html +++ b/demos/git.html @@ -234,35 +234,95 @@ cherry-pick id: "Pick me" merge newbranch -

Merge from main graph

+

Merge from main onto undeveloped branch graph

     ---
-    title: Merge from main (left-to-right)
+    title: Merge from main onto undeveloped branch (left-to-right)
     ---
     gitGraph LR:
     commit
     branch develop
     commit
     checkout main
-    commit id:"A"
-    checkout develop
     commit
+    checkout develop
     merge main
     
     ---
-    title: Merge from main (top-to-bottom)
+    title: Merge from main onto undeveloped branch (top-to-bottom)
     ---
     gitGraph TB:
     commit
     branch develop
     commit
     checkout main
-    commit id:"A"
+    commit
+    checkout develop
+    merge main
+    
+

Merge from main onto developed branch graph

+
+    ---
+    title: Merge from main onto developed branch (left-to-right)
+    ---
+    gitGraph LR:
+    commit
+    branch develop
+    commit
+    checkout main
+    commit
     checkout develop
     commit
     merge main
     
+
+    ---
+    title: Merge from main onto developed branch (top-to-bottom)
+    ---
+    gitGraph TB:
+    commit
+    branch develop
+    commit
+    checkout main
+    commit
+    checkout develop
+    commit
+    merge main
+    
+

Two branches from same commit graph

+
+    ---
+    title: Two branches from same commit (left-to-right)
+    ---
+    gitGraph LR:
+    commit
+    commit
+    branch feature-001
+    commit
+    commit
+    checkout main
+    branch feature-002
+    commit
+    checkout feature-001
+    merge feature-002
+    
+
+    ---
+    title: Two branches from same commit (top-to-bottom)
+    ---
+    gitGraph TB:
+    commit
+    commit
+    branch feature-001
+    commit
+    commit
+    checkout main
+    branch feature-002
+    commit
+    checkout feature-001
+    merge feature-002
+    

Three branches and a cherry-pick from each graph

     ---