diff --git a/demos/git.html b/demos/git.html index fda175e07..945b91b2c 100644 --- a/demos/git.html +++ b/demos/git.html @@ -78,7 +78,7 @@ --- title: Two-way merges (left-to-right) --- - gitGraph: + gitGraph LR: commit branch develop checkout develop @@ -110,10 +110,72 @@ checkout main merge develop -

Simple "cherry-pick" graph

+

Cherry-pick from branch graph

     ---
-    title: Cherry-pick (left-to-right)
+    title: Cherry-pick from branch (left-to-right)
+    ---
+    gitGraph LR:
+    commit
+    branch newbranch
+    checkout newbranch
+    commit id: "Pick me"
+    checkout main
+    commit
+    checkout newbranch
+    commit
+    checkout main
+    cherry-pick id: "Pick me"
+    
+
+    ---
+    title: Cherry-pick from branch (top-to-bottom)
+    ---
+    gitGraph TB:
+    commit
+    branch newbranch
+    checkout newbranch
+    commit id: "Pick me"
+    checkout main
+    commit
+    checkout newbranch
+    commit
+    checkout main
+    cherry-pick id: "Pick me"
+    
+

Cherry-pick from main graph

+
+    ---
+    title: Cherry-pick from main (left-to-right)
+    ---
+    gitGraph LR:
+    commit
+    branch develop
+    commit
+    checkout main
+    commit id:"A"
+    checkout develop
+    commit
+    cherry-pick id: "A"
+    
+
+    ---
+    title: Cherry-pick from main (top-to-bottom)
+    ---
+    gitGraph TB:
+    commit
+    branch develop
+    commit
+    checkout main
+    commit id:"A"
+    checkout develop
+    commit
+    cherry-pick id: "A"
+    
+

Cherry-pick then merge graph

+
+    ---
+    title: Cherry-pick then merge (left-to-right)
     ---
     gitGraph LR:
     commit
@@ -130,7 +192,7 @@
     
     ---
-    title: Cherry-pick (top-to-bottom)
+    title: Cherry-pick then merge (top-to-bottom)
     ---
     gitGraph TB:
     commit
@@ -145,6 +207,35 @@
     cherry-pick id: "Pick me"
     merge newbranch
     
+

Merge from main graph

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

Three branches graph

     ---