From daily commands to history mastery and branching strategy
Module 1
Git Internals & History Rewriting
- Git object model: blobs, trees, commits, tags — what Git actually stores
- The index (staging area): what it is and how to use it intentionally
- Detached HEAD and what it means
- git reflog: recovering from any mistake
- Interactive rebase: squash, reorder, edit, drop commits
- fixup commits and autosquash
- Cherry-pick: moving commits across branches deliberately
- git bisect: binary search for the commit that introduced a bug
- Revert vs reset: undoing changes safely
- Stash: stash push/pop/apply, named stashes, stash branches
- Submodules: when to use them and when not to
- git blame and git log --follow: understanding who changed what and why
Module 2
Branching Strategies & Team Workflows
- Gitflow: branches, release flow, when it fits — and why it often doesn't anymore
- Trunk-based development: short-lived branches, feature flags, continuous integration
- GitHub Flow: simple, works well for most teams
- Merge vs rebase vs squash merge: what each produces in history
- Pull request workflow: review guidelines, branch protection, required checks
- Commit message conventions: Conventional Commits — feat, fix, chore, breaking changes
- Semantic versioning from commits: automated release notes and changelog generation
- Monorepo vs polyrepo: trade-offs for teams and tooling
- Git hooks: pre-commit, pre-push — enforcing standards locally
- .gitattributes: line endings, merge strategies, linguist overrides
What your team walks away with
Developers who know what Git is doing — not just what buttons to press — and teams who have chosen a branching strategy intentionally rather than by accident.
- Navigate and rewrite Git history with interactive rebase, cherry-pick, and reflog recovery
- Choose a branching strategy (trunk-based vs Gitflow) based on team and release cadence
- Write meaningful commit messages with Conventional Commits for automated changelogs
- Set up branch protection, commit hooks, and PR workflows that enforce team standards
Book the Git & Advanced Workflows training
Suitable for all levels — from developers who want to stop fearing rebase to teams who want to standardize their Git workflow.
Get in touch