GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-14 06:43:25 +08:00
Code Issues Projects Releases Wiki Activity

added merge commit type

Browse Source
This commit is contained in:
Ashish Jain 2022-03-03 19:10:34 +01:00
parent 7e041dd921
commit 56a1c27907
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/diagrams/git/gitGraphAst.js
View File

@ -7,9 +7,6 @@ let curBranch = 'master';
let direction = 'LR'; let direction = 'LR';
let seq = 0; let seq = 0;
/**
*
*/
function getId() { function getId() {
return random({ length: 7 }); return random({ length: 7 });
} }
@ -124,6 +121,7 @@ export const merge = function (otherBranch) {
seq: seq++, seq: seq++,
parents: [head == null ? null : head.id, branches[otherBranch]], parents: [head == null ? null : head.id, branches[otherBranch]],
branch: curBranch, branch: curBranch,
type: commitType.MERGE,
}; };
head = commit; head = commit;
commits[commit.id] = commit; commits[commit.id] = commit;
@ -259,6 +257,7 @@ export const commitType = {
NORMAL: 0, NORMAL: 0,
REVERSE: 1, REVERSE: 1,
HIGHLIGHT: 2, HIGHLIGHT: 2,
MERGE: 3,
}; };
export default { export default {