diff --git a/demos/git.html b/demos/git.html index 37fa8a461..fda175e07 100644 --- a/demos/git.html +++ b/demos/git.html @@ -14,12 +14,13 @@ -

Git diagram demo

+

Git graph demo

+

Simple "branch and merge" graph

     ---
-    title: Simple "branch and merge"
+    title: Simple "branch and merge" (left-to-right)
     ---
-    gitGraph:
+    gitGraph LR:
     commit
     branch newbranch
     checkout newbranch
@@ -27,12 +28,24 @@
     checkout main
     merge newbranch
     
-
     ---
-    title: Continuous development
+    title: Simple "branch and merge" (top-to-bottom)
     ---
-    gitGraph:
+    gitGraph TB:
+    commit
+    branch newbranch
+    checkout newbranch
+    commit
+    checkout main
+    merge newbranch
+    
+

Continuous development graph

+
+    ---
+    title: Continuous development (left-to-right)
+    ---
+    gitGraph LR:
     commit
     branch develop
     checkout develop
@@ -46,7 +59,24 @@
     
     ---
-    title: Two-way merges
+    title: Continuous development (top-to-bottom)
+    ---
+    gitGraph TB:
+    commit
+    branch develop
+    checkout develop
+    commit
+    checkout main
+    merge develop
+    checkout develop
+    commit
+    checkout main
+    merge develop
+    
+

Two-way merges

+
+    ---
+    title: Two-way merges (left-to-right)
     ---
     gitGraph:
     commit
@@ -64,9 +94,28 @@
     
     ---
-    title: Cherry-pick
+    title: Two-way merges (top-to-bottom)
     ---
-    gitGraph:
+    gitGraph TB:
+    commit
+    branch develop
+    checkout develop
+    commit
+    checkout main
+    merge develop
+    commit
+    checkout develop
+    merge main
+    commit
+    checkout main
+    merge develop
+    
+

Simple "cherry-pick" graph

+
+    ---
+    title: Cherry-pick (left-to-right)
+    ---
+    gitGraph LR:
     commit
     branch newbranch
     checkout newbranch
@@ -81,9 +130,47 @@
     
     ---
-    title: Three branches
+    title: Cherry-pick (top-to-bottom)
     ---
-    gitGraph:
+    gitGraph TB:
+    commit
+    branch newbranch
+    checkout newbranch
+    commit id: "Pick me"
+    checkout main
+    commit
+    checkout newbranch
+    commit
+    checkout main
+    cherry-pick id: "Pick me"
+    merge newbranch
+    
+

Three branches graph

+
+    ---
+    title: Three branches (left-to-right)
+    ---
+    gitGraph LR:
+    commit
+    branch develop
+    checkout develop
+    commit
+    branch feature
+    checkout feature
+    commit
+    checkout main
+    merge feature id:"Direct to main"
+    checkout develop
+    merge feature
+    commit
+    checkout main
+    merge develop
+    
+
+    ---
+    title: Three branches (top-to-bottom)
+    ---
+    gitGraph TB:
     commit
     branch develop
     checkout develop
@@ -99,7 +186,6 @@
     checkout main
     merge develop
     
-