New and updated lessons from Modern Git Academy. Master Git. Engineer on GitHub. Automate Everything.https://moderngitacademy.com/en-ushttps://moderngitacademy.com/git/what-is-git/https://moderngitacademy.com/git/what-is-git/Git is a distributed version control system that records project history as snapshots. Learn what it does, why it exists, and how developers use it.Git FundamentalsGetting StartedBeginnerhttps://moderngitacademy.com/git/git-vs-github/https://moderngitacademy.com/git/git-vs-github/Git is version control software you run locally. GitHub is a hosting platform built around it. Here is exactly where one ends and the other begins.Git FundamentalsGetting StartedBeginnerhttps://moderngitacademy.com/git/how-git-works/https://moderngitacademy.com/git/how-git-works/A complete walkthrough of Git's data model: the working tree, the index, the object database, refs, and what git add and git commit really do.Git FundamentalsGetting StartedBeginner → Intermediatehttps://moderngitacademy.com/git/install-git-ubuntu/https://moderngitacademy.com/git/install-git-ubuntu/Install Git on Ubuntu with apt, verify the version, and configure identity, default branch, editor and credentials across all three config scopes.Git FundamentalsGetting StartedBeginnerhttps://moderngitacademy.com/git/install-git-windows/https://moderngitacademy.com/git/install-git-windows/Install Git on Windows with winget or the official installer, then configure line endings, the credential manager, default branch and your editor.Git FundamentalsGetting StartedBeginnerhttps://moderngitacademy.com/git/install-git-macos/https://moderngitacademy.com/git/install-git-macos/Install Git on macOS using Xcode Command Line Tools or Homebrew, understand which binary you are running, and configure identity and credentials.Git FundamentalsGetting StartedBeginnerhttps://moderngitacademy.com/git/first-git-repository/https://moderngitacademy.com/git/first-git-repository/Create a repository, stage a file, make commits, read the log and diff your changes — a full hands-on walkthrough that explains every command.Git FundamentalsGetting StartedBeginnerhttps://moderngitacademy.com/git/working-tree/https://moderngitacademy.com/git/working-tree/The working tree is the checkout you edit. Learn tracked, untracked, modified, deleted and ignored files, and how git status reads them.Git FundamentalsGetting StartedBeginnerhttps://moderngitacademy.com/git/git-index/https://moderngitacademy.com/git/git-index/The index is a real file that holds the next commit's exact content. Learn what it stores, why Git has one, and how partial staging works.Git FundamentalsGetting StartedBeginner → Intermediatehttps://moderngitacademy.com/git/head/https://moderngitacademy.com/git/head/HEAD is a symbolic reference to your current branch. Learn how it moves, what detached HEAD means, and how HEAD~ and HEAD^ navigate history.Git FundamentalsGetting StartedBeginner → Intermediatehttps://moderngitacademy.com/git/git-objects/https://moderngitacademy.com/git/git-objects/Git stores everything as four object types in a content-addressable database. Explore blobs, trees, commits and tags with real plumbing commands.Git FundamentalsGetting StartedIntermediatehttps://moderngitacademy.com/git/git-repository-structure/https://moderngitacademy.com/git/git-repository-structure/A guided tour of a real .git directory — HEAD, config, index, objects, refs, logs, hooks and packed-refs — and which of them are conditional.Git FundamentalsGetting StartedIntermediatehttps://moderngitacademy.com/workflows/branching/git-branches/https://moderngitacademy.com/workflows/branching/git-branches/A Git branch is a movable reference to a commit, not a copy of your project. Learn how branches, HEAD and remote-tracking refs actually work.Modern Git WorkflowsBranchingBeginner → Intermediatehttps://moderngitacademy.com/workflows/branching/feature-branch-workflow/https://moderngitacademy.com/workflows/branching/feature-branch-workflow/Develop each change on its own branch, review it, then integrate. A complete walkthrough of the feature branch workflow and its failure modes.Modern Git WorkflowsBranchingBeginner → Intermediatehttps://moderngitacademy.com/workflows/branching/github-flow/https://moderngitacademy.com/workflows/branching/github-flow/GitHub Flow is a lightweight branch-and-pull-request workflow built for continuous delivery. Here is how it works and where its limits are.Modern Git WorkflowsBranchingBeginner → Intermediatehttps://moderngitacademy.com/workflows/branching/git-flow/https://moderngitacademy.com/workflows/branching/git-flow/Git Flow uses develop, release and hotfix branches around main. Learn the model, why it was designed, and why many teams no longer use it.Modern Git WorkflowsBranchingIntermediatehttps://moderngitacademy.com/workflows/branching/trunk-based-development/https://moderngitacademy.com/workflows/branching/trunk-based-development/Trunk-based development keeps everyone integrating into one branch continuously. Learn the practices and the engineering maturity it requires.Modern Git WorkflowsBranchingIntermediatehttps://moderngitacademy.com/workflows/branching/short-lived-branches/https://moderngitacademy.com/workflows/branching/short-lived-branches/The longer a branch lives, the more it diverges from what it must integrate with. Learn why branch lifetime drives merge pain.Modern Git WorkflowsBranchingBeginner → Intermediatehttps://moderngitacademy.com/workflows/branching/release-branches/https://moderngitacademy.com/workflows/branching/release-branches/Release branches freeze a version for stabilisation while development continues. Learn when they earn their complexity and when they do not.Modern Git WorkflowsBranchingIntermediatehttps://moderngitacademy.com/workflows/branching/choosing-a-branching-strategy/https://moderngitacademy.com/workflows/branching/choosing-a-branching-strategy/Compare feature branches, GitHub Flow, Git Flow and trunk-based development against your team size, release model and CI maturity.Modern Git WorkflowsBranchingIntermediatehttps://moderngitacademy.com/workflows/merging/git-merge/https://moderngitacademy.com/workflows/merging/git-merge/Merging combines two histories by finding their merge base and reconciling both sets of changes. A complete guide to how git merge works.Modern Git WorkflowsMergingBeginner → Intermediatehttps://moderngitacademy.com/workflows/merging/fast-forward-vs-three-way-merge/https://moderngitacademy.com/workflows/merging/fast-forward-vs-three-way-merge/Whether Git can fast-forward depends entirely on ancestry. Learn the difference, the flags that control it, and which to prefer when.Modern Git WorkflowsMergingIntermediatehttps://moderngitacademy.com/workflows/merging/merge-commits/https://moderngitacademy.com/workflows/merging/merge-commits/A merge commit is the only commit with more than one parent. Learn what that buys you, what it costs, and how reverting one differs.Modern Git WorkflowsMergingBeginner → Intermediatehttps://moderngitacademy.com/workflows/merging/squash-merging/https://moderngitacademy.com/workflows/merging/squash-merging/Squash merging collapses a branch into a single commit. Learn how git merge --squash differs from GitHub's squash button, and the trade-offs.Modern Git WorkflowsMergingBeginner → Intermediatehttps://moderngitacademy.com/workflows/merging/rebase-and-merge/https://moderngitacademy.com/workflows/merging/rebase-and-merge/Rebase-and-merge replays each commit onto the target branch. Learn what it does to commit IDs, authorship and history, and when to choose it.Modern Git WorkflowsMergingIntermediatehttps://moderngitacademy.com/workflows/merging/resolving-merge-conflicts/https://moderngitacademy.com/workflows/merging/resolving-merge-conflicts/Conflicts happen when both sides change the same region. Learn to read conflict markers, resolve them safely, and verify the result.Modern Git WorkflowsMergingIntermediatehttps://moderngitacademy.com/workflows/merging/advanced-merge-strategies/https://moderngitacademy.com/workflows/merging/advanced-merge-strategies/Beyond the default: merge strategies versus strategy options, rename detection, octopus and ours merges, and custom merge drivers.Modern Git WorkflowsMergingIntermediate → Advancedhttps://moderngitacademy.com/workflows/rebasing/git-rebase/https://moderngitacademy.com/workflows/rebasing/git-rebase/Rebase replays your commits onto a new base, creating new commits with new IDs. Learn the mechanism, the conflict loop and the safety rules.Modern Git WorkflowsRebasingIntermediatehttps://moderngitacademy.com/workflows/rebasing/interactive-rebase/https://moderngitacademy.com/workflows/rebasing/interactive-rebase/Interactive rebase lets you reword, reorder, squash, split and drop commits before review. A hands-on guide to the todo list and its commands.Modern Git WorkflowsRebasingIntermediate → Advancedhttps://moderngitacademy.com/workflows/rebasing/reordering-commits/https://moderngitacademy.com/workflows/rebasing/reordering-commits/Reordering commits means rewriting them. Learn how to reorder safely with interactive rebase, handle dependencies, and recover if it goes wrong.Modern Git WorkflowsRebasingIntermediatehttps://moderngitacademy.com/workflows/rebasing/squashing-commits/https://moderngitacademy.com/workflows/rebasing/squashing-commits/Combine several commits into one with interactive rebase. Learn squash versus fixup, autosquash, and when granular commits are worth keeping.Modern Git WorkflowsRebasingIntermediatehttps://moderngitacademy.com/workflows/rebasing/editing-commit-history/https://moderngitacademy.com/workflows/rebasing/editing-commit-history/Amend, rebase, revert and reset do different things. A decision framework for changing history, plus recovery when an edit goes wrong.Modern Git WorkflowsRebasingIntermediate → Advancedhttps://moderngitacademy.com/workflows/rebasing/rebase-vs-merge/https://moderngitacademy.com/workflows/rebasing/rebase-vs-merge/Rebase and merge produce different histories with different trade-offs for auditing, debugging and collaboration. A decision guide, not a verdict.Modern Git WorkflowsRebasingIntermediatehttps://moderngitacademy.com/workflows/rebasing/when-not-to-rebase/https://moderngitacademy.com/workflows/rebasing/when-not-to-rebase/Rebasing shared history creates work for everyone else. Learn the situations where rebasing is the wrong tool, and the nuanced exceptions.Modern Git WorkflowsRebasingIntermediatehttps://moderngitacademy.com/workflows/productivity/git-worktrees/https://moderngitacademy.com/workflows/productivity/git-worktrees/A worktree gives one repository a second checked-out directory. Learn to create, list, move, lock and remove worktrees, and when they beat cloning.Modern Git WorkflowsModern Git ProductivityIntermediatehttps://moderngitacademy.com/workflows/productivity/multiple-branches-without-multiple-clones/https://moderngitacademy.com/workflows/productivity/multiple-branches-without-multiple-clones/You need two branches checked out at once. Compare re-cloning, stashing and worktrees, then set up the worktree solution step by step.Modern Git WorkflowsModern Git ProductivityIntermediatehttps://moderngitacademy.com/workflows/productivity/git-sparse-checkout/https://moderngitacademy.com/workflows/productivity/git-sparse-checkout/Sparse checkout controls which tracked paths populate your working tree. Learn cone mode, the commands, and how it differs from partial clone.Modern Git WorkflowsModern Git ProductivityIntermediate → Advancedhttps://moderngitacademy.com/workflows/productivity/partial-clone/https://moderngitacademy.com/workflows/productivity/partial-clone/Partial clone defers downloading objects until they are needed. Learn filters, promisor remotes, lazy fetching and where the trade-offs bite.Modern Git WorkflowsModern Git ProductivityIntermediate → Advancedhttps://moderngitacademy.com/workflows/productivity/shallow-clone/https://moderngitacademy.com/workflows/productivity/shallow-clone/A shallow clone truncates commit history to a depth you choose. Learn where it helps, what breaks, and how to deepen or unshallow later.Modern Git WorkflowsModern Git ProductivityIntermediatehttps://moderngitacademy.com/workflows/productivity/git-hooks/https://moderngitacademy.com/workflows/productivity/git-hooks/Hooks run your scripts at defined points in Git's operations. Learn the useful hooks, how to share them with a team, and their enforcement limits.Modern Git WorkflowsModern Git ProductivityIntermediate → Advancedhttps://moderngitacademy.com/workflows/productivity/git-aliases/https://moderngitacademy.com/workflows/productivity/git-aliases/Aliases turn long Git invocations into short ones. Learn simple and shell aliases, quoting, scope, and a curated set worth adopting.Modern Git WorkflowsModern Git ProductivityIntermediatehttps://moderngitacademy.com/workflows/productivity/git-maintenance/https://moderngitacademy.com/workflows/productivity/git-maintenance/Git repacks and prunes itself automatically, and git maintenance can schedule more. Learn the tasks, when to intervene, and when not to.Modern Git WorkflowsModern Git ProductivityIntermediate → Advancedhttps://moderngitacademy.com/workflows/productivity/git-configuration/https://moderngitacademy.com/workflows/productivity/git-configuration/Git reads configuration from several files in a defined order. Learn the scopes, precedence, conditional includes and the settings worth changing.Modern Git WorkflowsModern Git ProductivityIntermediate → Advancedhttps://moderngitacademy.com/workflows/productivity/git-credential-managers/https://moderngitacademy.com/workflows/productivity/git-credential-managers/Git delegates authentication to credential helpers. Learn how the subsystem works, which helper to use, and why plaintext storage is a poor choice.Modern Git WorkflowsModern Git ProductivityIntermediatehttps://moderngitacademy.com/workflows/productivity/signed-commits/https://moderngitacademy.com/workflows/productivity/signed-commits/Signing attaches a cryptographic signature to a commit or tag. Learn GPG and SSH signing, verification, and precisely what a signature does not prove.Modern Git WorkflowsModern Git ProductivityIntermediate → Advanced