Skip to content

Commit b92a75c

Browse files
authored
Merge pull request #85 from braboj/fix/home-page-content
Update home page for chapter structure
2 parents b599dab + 70c9665 commit b92a75c

1 file changed

Lines changed: 50 additions & 42 deletions

File tree

astro-site/src/pages/index.astro

Lines changed: 50 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
---
22
import DocLayout from "../layouts/DocLayout.astro";
33
4+
const base = import.meta.env.BASE_URL;
5+
46
const headings = [
57
{ depth: 2, slug: "what-youll-learn", text: "What you'll learn" },
6-
{ depth: 2, slug: "learning-path", text: "Learning path" },
8+
{ depth: 2, slug: "chapters", text: "Chapters" },
79
{ depth: 2, slug: "quick-start", text: "Quick start" },
810
{ depth: 2, slug: "about", text: "About" },
911
{ depth: 2, slug: "selected-references", text: "Selected references" },
@@ -15,72 +17,80 @@ const headings = [
1517

1618
<p>
1719
A hands-on tutorial that takes you from first commit to confident daily use.
18-
Learn Git's concepts first, then apply them through practical command
19-
references and real-world examples.
20+
Learn Git's concepts first, then apply them through practical exercises
21+
and real-world examples.
2022
</p>
2123

2224
<h2 id="what-youll-learn">What you'll learn</h2>
2325

2426
<ul>
2527
<li>
26-
<strong>Concepts</strong> — Understand how Git actually works: objects,
27-
references, branching, merging, conflict resolution, and branching strategies.
28+
<strong>How Git works</strong> — the workspace, index, and repository
29+
pipeline that every command builds on.
30+
</li>
31+
<li>
32+
<strong>Building blocks</strong> — objects, references, HEAD, and how
33+
Git stores your project history internally.
2834
</li>
2935
<li>
30-
<strong>Operations</strong> — Master 30+ Git commands organized by workflow:
31-
create, track, branch, sync, revert, and inspect.
36+
<strong>Branching and merging</strong> — work on features in isolation,
37+
merge strategies, conflict resolution, cherry-pick, rebase, and stash.
3238
</li>
3339
<li>
34-
<strong>Test yourself</strong> — 96 quiz questions to validate your
35-
understanding and prepare for technical interviews.
40+
<strong>Remote collaboration</strong> — clone, push, pull, fetch, and
41+
forking workflows for team projects.
3642
</li>
3743
<li>
38-
<strong>Reference</strong> — Git dictionary, cheat sheets, client tools,
39-
and curated external resources.
44+
<strong>Expert topics</strong> — configuration, selectors, refspecs,
45+
hooks, bisect, and history rewriting.
4046
</li>
4147
</ul>
4248

43-
<h2 id="learning-path">Learning path</h2>
49+
<h2 id="chapters">Chapters</h2>
4450

4551
<table>
46-
<caption>Six stages from setup to mastery</caption>
4752
<thead>
4853
<tr>
49-
<th>Stage</th>
50-
<th>Topics</th>
51-
<th>You'll be able to...</th>
54+
<th>Chapter</th>
55+
<th>What you'll learn</th>
5256
</tr>
5357
</thead>
5458
<tbody>
5559
<tr>
56-
<td><strong>1. Setup</strong></td>
57-
<td>Installation, hosting services</td>
58-
<td>Install Git and create a GitHub account</td>
60+
<td><a href={`${base}introduction/`}>Introduction</a></td>
61+
<td>What Git is, installation, how it works, command overview</td>
5962
</tr>
6063
<tr>
61-
<td><strong>2. Basics</strong></td>
62-
<td>Repository, configuration, dataflow</td>
63-
<td>Initialize repos, configure identity, understand staging</td>
64+
<td><a href={`${base}building-blocks/`}>Building Blocks</a></td>
65+
<td>Repositories, objects, references, HEAD, tags</td>
6466
</tr>
6567
<tr>
66-
<td><strong>3. Daily workflow</strong></td>
67-
<td>add, commit, push, pull, status, log, diff</td>
68-
<td>Track changes and collaborate with a remote</td>
68+
<td><a href={`${base}branching-and-merging/`}>Branching and Merging</a></td>
69+
<td>Branches, merge strategies, rebase, cherry-pick, conflicts, stash</td>
6970
</tr>
7071
<tr>
71-
<td><strong>4. Branching</strong></td>
72-
<td>branch, checkout, merge, stash</td>
73-
<td>Work on features in isolation and integrate them</td>
72+
<td><a href={`${base}remote-repositories/`}>Remote Repositories</a></td>
73+
<td>Clone, push, pull, fetch, remote tracking, forking workflows</td>
7474
</tr>
7575
<tr>
76-
<td><strong>5. Advanced</strong></td>
77-
<td>rebase, cherry-pick, reset, conflicts</td>
78-
<td>Rewrite history, resolve conflicts, recover from mistakes</td>
76+
<td><a href={`${base}subprojects/`}>Subprojects</a></td>
77+
<td>Submodules and subtrees for managing dependencies</td>
7978
</tr>
8079
<tr>
81-
<td><strong>6. Mastery</strong></td>
82-
<td>Objects, references, selectors, refspec</td>
83-
<td>Understand Git internals and debug complex situations</td>
80+
<td><a href={`${base}expert-topics/`}>Expert Topics</a></td>
81+
<td>Configuration, selectors, refspecs, hooks, bisect, rewriting history</td>
82+
</tr>
83+
<tr>
84+
<td><a href={`${base}playbook/`}>Playbook</a></td>
85+
<td>Step-by-step recipes for common Git tasks</td>
86+
</tr>
87+
<tr>
88+
<td><a href={`${base}appendix/`}>Appendix</a></td>
89+
<td>Merge strategies, SSH setup, Git clients, references</td>
90+
</tr>
91+
<tr>
92+
<td><a href={`${base}glossary/`}>Glossary</a></td>
93+
<td>Key terms and definitions</td>
8494
</tr>
8595
</tbody>
8696
</table>
@@ -90,17 +100,15 @@ const headings = [
90100
<p>New to Git? Start here:</p>
91101

92102
<ol>
93-
<li><a href="/introduction/#install-on-windows">Install Git</a> on your machine</li>
94-
<li><a href="/introduction/#git-dataflow">Understand the dataflow</a> — working directory, index, local repo, remote</li>
95-
<li><a href="/operations/create/#git-init">Create your first repository</a></li>
96-
<li><a href="/operations/track/#git-commit">Make your first commit</a></li>
103+
<li><a href={`${base}introduction/#installation`}>Install Git</a> on your machine</li>
104+
<li><a href={`${base}introduction/#how-git-works`}>Understand how Git works</a> — workspace, index, repository</li>
105+
<li><a href={`${base}introduction/#exercises`}>Try the exercises</a> — clone, commit, push, pull</li>
97106
</ol>
98107

99108
<h2 id="about">About</h2>
100109

101110
<p>
102-
Created by <a href="https://github.com/braboj">Branimir Georgiev</a> and
103-
<a href="https://github.com/marwan-rashed">Marwan Rashed</a>.
111+
Created by <a href="https://github.com/braboj">Branimir Georgiev</a>.
104112
</p>
105113
<p>
106114
Part of <a href="https://codewithbranko.com">Code with Branko</a> — practical tutorials for developers.
@@ -109,10 +117,10 @@ const headings = [
109117
<h2 id="selected-references">Selected references</h2>
110118

111119
<ul>
120+
<li><a href="https://git-scm.com/book/en/v2">Pro Git Book</a> — the definitive reference</li>
112121
<li><a href="https://github.com/pluralsight/git-internals-pdf/releases">Git Internals</a> — deep dive into Git's object model</li>
113122
<li><a href="https://github.com/k88hudson/git-flight-rules">Flight Rules for Git</a> — what to do when things go wrong</li>
114123
<li><a href="http://think-like-a-git.net/">Think Like (a) Git</a> — graph theory perspective</li>
115-
<li><a href="https://git-scm.com/book/en/v2">Pro Git Book</a> — the definitive reference</li>
116-
<li><a href="https://githowto.com/">Git How To</a> — guided tour</li>
124+
<li><a href="https://learngitbranching.js.org/">Learn Git Branching</a> — interactive branching exercises</li>
117125
</ul>
118126
</DocLayout>

0 commit comments

Comments
 (0)