Stage 2 · Tools
Git Version Control
Master Git from first commit to advanced workflows — branching strategies, rebasing, hooks, and the team collaboration patterns used at every engineering company.
Prerequisite
Any coding experience.
What this course leaves you with
- Branch, merge, and recover without fear
- Use team workflows like trunk-based development or GitFlow
- Automate safety checks with hooks and CI
Why this stage matters — Version control is in place. Next: automate everything from the shell.
Progress
0 of 36 lessons complete. Progress is stored locally in your browser so you can pick the path back up later.
course completion
Git Fundamentals
How Git stores data, the index, commits, trees, and blobs — knowing the internals makes every command obvious.
- 01What is Git?Content-addressable storage, SHA hashes, and why Git is different from other VCS tools.6 min
- 02init, add, commitCreate a repo, stage changes with the index, and write good commit messages.7 min
- 03Objects & Refsblobs, trees, commits, and tags — what every .git object actually is.6 min
- 04log, diff, statusNavigate history, compare changes, and understand your working tree state.6 min
- 05Undoing Changesrestore, reset, revert, clean — choosing the right undo for every situation.7 min
- 06StashingPark work-in-progress safely, apply, pop, and manage a stash stack.5 min
Branching & Merging
Branches are cheap and powerful — learn to use them correctly and merge without pain.
- 01Creating Branchesbranch, checkout, switch — when to create, how branches share history.6 min
- 02Merging StrategiesFast-forward, recursive, octopus — choosing the right merge strategy.7 min
- 03Resolving ConflictsUnderstanding conflict markers, using diff3, and resolving cleanly.8 min
- 04RebasingRebase vs merge, interactive rebase, squash, fixup, and reorder commits.9 min
- 05Cherry-PickingApply individual commits across branches without merging.6 min
- 06Tagging ReleasesLightweight vs annotated tags, semantic versioning, and release workflows.6 min
Remote Collaboration
Push, pull, fetch, and collaborate across teams without stepping on each other's work.
- 01Remotesremote add, fetch, pull, push — how Git tracks remote branches.7 min
- 02Pull Requests & Code ReviewPR workflow, review etiquette, squash vs merge, and keeping history clean.8 min
- 03Fork & Upstream WorkflowContributing to open source with forks, upstream remotes, and sync patterns.7 min
- 04blame & bisectFind who changed what and binary-search for the commit that broke something.7 min
- 05Submodules & SubtreesWhen and how to nest Git repos for monorepo-lite workflows.7 min
- 06Large Repos & Shallow Clonessparse-checkout, partial clone, LFS — working with big repos efficiently.6 min
Branching Strategies
GitFlow, trunk-based development, GitHub Flow — choosing the right strategy for your team's cadence.
- 01Trunk-Based DevelopmentShort-lived branches, feature flags, and continuous integration principles.7 min
- 02GitFlowFeature, release, hotfix, and develop branches — when this model makes sense.7 min
- 03GitHub FlowSimplified branch-per-feature workflow optimized for continuous delivery.6 min
- 04Monorepo StrategiesOne repo for many services — tagging, scoped commits, and CI selectors.7 min
- 05Commit ConventionsConventional Commits, CHANGELOG generation, and release automation.6 min
- 06Practice: Team SimulationSimulate a 4-person team with conflicts, reviews, and a hotfix release.8 min
Hooks & Automation
Use Git hooks to enforce standards, run tests, and automate repetitive tasks.
- 01Client-Side Hookspre-commit, commit-msg, prepare-commit-msg — enforce style and tests locally.7 min
- 02Server-Side Hookspre-receive, update, post-receive — enforce policy at the server level.6 min
- 03Lefthook & HuskyManage hooks across a team with version-controlled, fast hook runners.7 min
- 04GitHub Actions IntroTrigger workflows on push/PR, run tests, and auto-merge dependabot bumps.8 min
- 05Protected Branches & CODEOWNERSRequire reviews, pass CI, and route reviews to the right team automatically.6 min
- 06Commit Signing & SecurityGPG, SSH signing, vigilant mode, and supply-chain security for commits.6 min
Git Internals & Advanced
Go deep — rewrite history, recover deleted work, and automate Git from scripts.
- 01History Rewriting with filter-repoRemove secrets from history, split repos, and migrate with git-filter-repo.8 min
- 02reflog: Your Safety NetRecover from resets, rebases, and dropped stashes using the reflog.7 min
- 03WorktreesCheck out multiple branches simultaneously with git worktree.6 min
- 04Plumbing Commandshash-object, cat-file, ls-files — automate Git with low-level commands.7 min
- 05Git Notes & BundlesAttach metadata to commits and transfer repos without a server.6 min
- 06Capstone: Full Team WorkflowSimulate a complete product cycle — from branch to tagged release.8 min