marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-23 09:20:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into minmaps

Browse Source
This commit is contained in:
Knut Sveidqvist
2022-09-01 13:42:21 +02:00
parent 654dfa6b3d 98b2febe30
commit 68f8010ab9
17 changed files with 501 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/gitgraph.md
View File

@@ -182,6 +182,8 @@ After this we made use of the `checkout` keyword to set the current branch as `m
After this we merge the `develop` branch onto the current branch `main`, resulting in a merge commit.
Since the current branch at this point is still `main`, the last two commits are registered against that.
Additionally, you may add a tag to the merge commit, or override the default id: `merge branch id:"1234" tag:"v1.0.0"`
### Cherry Pick commit from another branch
Similar to how 'git' allows you to cherry-pick a commit from **another branch** onto the **current** branch, Mermaid also supports this functionality. You can also cherry-pick a commit from another branch using the `cherry-pick` keyword.