diff --git a/demos/git.html b/demos/git.html index f24217711..37fa8a461 100644 --- a/demos/git.html +++ b/demos/git.html @@ -17,27 +17,89 @@
--- - title: Simple Git diagram + title: Simple "branch and merge" --- gitGraph: - options - { - "nodeSpacing": 50, - "nodeRadius": 5 - } - end - branch master commit branch newbranch checkout newbranch commit - commit - checkout master - commit - commit + checkout main merge newbranch+
+ --- + title: Continuous development + --- + gitGraph: + commit + branch develop + checkout develop + commit + checkout main + merge develop + checkout develop + commit + checkout main + merge develop ++
+ --- + title: Two-way merges + --- + gitGraph: + commit + branch develop + checkout develop + commit + checkout main + merge develop + commit + checkout develop + merge main + commit + checkout main + merge develop ++
+ --- + title: Cherry-pick + --- + gitGraph: + commit + branch newbranch + checkout newbranch + commit id: "Pick me" + checkout main + commit + checkout newbranch + commit + checkout main + cherry-pick id: "Pick me" + merge newbranch ++
+ --- + title: Three branches + --- + gitGraph: + 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 ++