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): allow cherry-pick to suppress tag altogether

Browse Source
This commit is contained in:
Elliot Nelson
2022-09-18 09:22:35 -04:00
parent 4f96116c43
commit 4e4b5ccf8d
4 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@ branchStatement
;
cherryPickStatement
: CHERRY_PICK COMMIT_ID STR {yy.cherryPick($3, '', '')}
: CHERRY_PICK COMMIT_ID STR {yy.cherryPick($3, '', 'cherry-pick:<id>')}
| CHERRY_PICK COMMIT_ID STR COMMIT_TAG STR {yy.cherryPick($3, '', $5)}
| CHERRY_PICK COMMIT_TAG STR COMMIT_ID STR {yy.cherryPick($5, '', $3)}
;