File tree Expand file tree Collapse file tree 1 file changed +20
-24
lines changed
Expand file tree Collapse file tree 1 file changed +20
-24
lines changed Original file line number Diff line number Diff line change @@ -202,10 +202,6 @@ $ git config --global alias.graph "log --all --graph --decorate --oneline"
202202
203203---
204204
205- <!-- .slide: data-background="#ffffff" -->
206-
207- <!-- .slide: style="font-size: 32px;" -->
208-
209205This is on the master branch
210206
211207``` shell
@@ -239,10 +235,6 @@ $ git graph
239235
240236---
241237
242- <!-- .slide: data-background="#ffffff" -->
243-
244- <!-- .slide: style="font-size: 36px;" -->
245-
246238Now we can delete the new branch we had created, since all the content is now in the master branch.
247239
248240``` shell
@@ -253,26 +245,30 @@ Comment: It is good practice to keep old branches for understanding of the devel
253245
254246---
255247
256- <!-- .slide: data-background="#ffffff" -->
257-
258- <!-- .slide: style="font-size: 26px;" -->
259-
260248In a somewhat nicer format, it looks like this:
261249
262250We commit stuff to both branches
263- ``` graphviz
264- digraph {
265- rankdir=LR
266- "commitX" -> "commit1"
267- "commit2" -> "commit1"
268- "commitY" -> "commitX"
269- "commit3" -> "commit2"
270- "master" -> "commit3" [style=dashed]
271- "cool-feature" -> "commitY"[style=dashed]
272- master [shape=plaintext]
273- "cool-feature" [shape=plaintext]
274- }
251+
252+ ``` mermaid
253+ graph LR
254+
255+ commitX(["commitX"])
256+ commit1(["commit1"])
257+ commit2(["commit2"])
258+ commitY(["commitY"])
259+ commit3(["commit3"])
260+
261+ commitX --> commit1
262+ commit2 --> commit1
263+ commitY --> commitX
264+ commit3 --> commit2
265+
266+ master["master")
267+ master -.-> commit3
268+ cool-feature["cool-feature"]
269+ cool-feature -.-> commitY
275270```
271+
276272(Time goes leftwards)
277273
278274---
You can’t perform that action at this time.
0 commit comments