Skip to content

Commit 3f87fff

Browse files
committed
Continuing to convert from hackmd
1 parent 85eb595 commit 3f87fff

File tree

1 file changed

+49
-29
lines changed

1 file changed

+49
-29
lines changed

docs/branches.md

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -918,41 +918,61 @@ Success!
918918
<!-- .slide: style="font-size: 28px;" -->
919919

920920
Branch 'bugfix' was branched from 'master'
921-
```graphviz
922-
digraph {
923-
rankdir=LR
924-
"commit2" -> "commit1"
925-
"commit3" -> "commit2"
926-
"commit4" -> "commit3"
927-
"commitX" -> "commit2"
928-
"master" -> "commit4" [style=dashed]
929-
"bugfix" -> "commitY" [style=dashed]
930-
"commitY" -> "commitX"
931-
master [shape=plaintext]
932-
"bugfix" [shape=plaintext]
933-
"HEAD" -> "bugfix" [style=dashed]
934-
HEAD [shape=plaintext]
935921

936-
}
922+
```mermaid
923+
graph LR
924+
925+
master["master"]
926+
style master fill:#ffffff,stroke:#ffffff
927+
head["HEAD"]
928+
style head fill:#ffffff,stroke:#ffffff
929+
bugfix["bugfix"]
930+
style bugfix fill:#ffffff,stroke:#ffffff
931+
932+
commit1(["commit1"])
933+
commit2(["commit2"])
934+
commit3(["commit3"])
935+
commit4(["commit4"])
936+
commitX(["commitX"])
937+
commitY(["commitY"])
938+
939+
master -.-> commit4
940+
commit4 --> commit3
941+
commit3 --> commit2
942+
head -.-> bugfix
943+
bugfix -.-> commitY
944+
commitY --> commitX
945+
commitX --> commit2
946+
commit2 --> commit1
937947
```
938948

939949

940950
Rebasing 'bugfix' onto the 'master' branch
941-
```graphviz
942-
digraph {
943-
rankdir=LR
944-
splines="line"
945-
"commit2" -> "commit1"
946-
"commit3" -> "commit2"
947-
"master" -> "commitY'" [style=dashed]
948-
"commit4" -> "commit3"
949-
"commitX'" -> "commit4"
950-
"commitY'" -> "commitX'"
951-
master [shape=plaintext]
952-
"HEAD" -> "master" [style=dashed]
953-
HEAD [shape=plaintext]
954951

955-
}
952+
```mermaid
953+
graph LR
954+
955+
master["master"]
956+
style master fill:#ffffff,stroke:#ffffff
957+
head["HEAD"]
958+
style head fill:#ffffff,stroke:#ffffff
959+
bugfix["bugfix"]
960+
style bugfix fill:#ffffff,stroke:#ffffff
961+
962+
commit1(["commit1"])
963+
commit2(["commit2"])
964+
commit3(["commit3"])
965+
commit4(["commit4"])
966+
commitXp(["commitX'"])
967+
commitYp(["commitY'"])
968+
969+
head -.-> master
970+
master -.-> commitYp
971+
commitYp --> commitXp
972+
commitXp --> commit4
973+
commit4 --> commit3
974+
commit3 --> commit2
975+
commit2 --> commit1
956976
```
957977

958978
---

0 commit comments

Comments
 (0)