Skip to content

Commit dc9c96d

Browse files
authored
Merge pull request #102 from braboj/fix/object-diagram-cleanup
Clean up object model diagram and prose
2 parents 2299e68 + 619b02f commit dc9c96d

4 files changed

Lines changed: 8 additions & 23 deletions

File tree

assets/drawio/git-object-model.drawio

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,6 @@
5959
<mxGeometry relative="1" as="geometry" />
6060
</mxCell>
6161

62-
<!-- commit → commit (parent) -->
63-
<mxCell id="arrow-commit-parent" value="" style="endArrow=classic;html=1;strokeColor=#444441;strokeWidth=1;endFill=1;endSize=6;curved=1;" edge="1" parent="1">
64-
<mxGeometry relative="1" as="geometry">
65-
<mxPoint x="310" y="200" as="sourcePoint" />
66-
<mxPoint x="310" y="200" as="targetPoint" />
67-
<Array as="points">
68-
<mxPoint x="310" y="160" />
69-
<mxPoint x="280" y="160" />
70-
</Array>
71-
</mxGeometry>
72-
</mxCell>
73-
<mxCell id="label-parent" value="parent" style="text;html=1;align=center;verticalAlign=middle;fontSize=11;fontColor=#5F5E5A;fontFamily=Helvetica;fontStyle=2;" vertex="1" parent="1">
74-
<mxGeometry x="265" y="140" width="50" height="20" as="geometry" />
75-
</mxCell>
76-
7762
<!-- commit → tree -->
7863
<mxCell id="arrow-commit-tree" value="" style="endArrow=classic;html=1;strokeColor=#444441;strokeWidth=1;endFill=1;endSize=6;" edge="1" parent="1" source="commit-card" target="tree-card">
7964
<mxGeometry relative="1" as="geometry" />

assets/images/git-object-model.png

-380 Bytes
Loading

astro-site/src/content/docs/building-blocks.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ Tags are **not** pushed automatically — you must run
214214
215215
### How Objects Relate
216216

217-
The diagram below shows how objects and references connect. Objects
218-
(solid arrows) are immutable data stored in `.git/objects/`. References
219-
(dashed arrows) are named pointers stored in `.git/HEAD` and
220-
`.git/refs/` that give human-readable names to commits.
217+
The diagram below shows how the four object types connect. A tag
218+
points to a commit, a commit points to a root tree, and a tree
219+
contains blobs (files) and other trees (subdirectories). All objects
220+
are immutable and stored in `.git/objects/`.
221221

222222
![Object Model](../assets/images/git-object-model.png)
223223

chapters/02-building-blocks.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ Tags are **not** pushed automatically — you must run
214214
215215
### How Objects Relate
216216

217-
The diagram below shows how objects and references connect. Objects
218-
(solid arrows) are immutable data stored in `.git/objects/`. References
219-
(dashed arrows) are named pointers stored in `.git/HEAD` and
220-
`.git/refs/` that give human-readable names to commits.
217+
The diagram below shows how the four object types connect. A tag
218+
points to a commit, a commit points to a root tree, and a tree
219+
contains blobs (files) and other trees (subdirectories). All objects
220+
are immutable and stored in `.git/objects/`.
221221

222222
![Object Model](../assets/images/git-object-model.png)
223223

0 commit comments

Comments
 (0)