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

feat(git): cherry-pick keyword supports tag attribute

Browse Source
This commit is contained in:
Elliot Nelson
2022-09-17 23:57:32 -04:00
parent e8eb2ab03f
commit ae920eaa93
4 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diagrams/git/parser/gitGraph.jison
View File

@@ -117,7 +117,9 @@ branchStatement
;
cherryPickStatement
: CHERRY_PICK COMMIT_ID STR {yy.cherryPick($3)}
: CHERRY_PICK COMMIT_ID STR {yy.cherryPick($3, '')}
| CHERRY_PICK COMMIT_ID STR COMMIT_TAG STR {yy.cherryPick($3, $4)}
| CHERRY_PICK COMMIT_TAG STR COMMIT_ID STR {yy.cherryPick($4, $3)}
;
mergeStatement