Git and Collaborative Development | Nesqual TechCourse outline
How git stores your work
- Content addressing: why a hash names your contentLesson30 min
- Loose objects on disk, zlib and the plumbing commandsLesson30 min
- Trees: how git records names, directories and modesLesson30 min
- Commits and annotated tags, byte by byteLesson35 min
- Packfiles, deltas and how safe SHA-1 isLesson30 min
- Quiz: how git stores your workQuiz15 min
- Lab: write cat-file and hash-object, then commit by handLab40 min
Refs, HEAD and the index
Refs are files that hold a hashLesson30 minPacked refs and how git finds a nameLesson30 minHEAD, detached HEAD and the special refsLesson30 minThe reflog filesLesson30 minThe index, byte by byteLesson35 minThe three trees: what add, restore and reset changeLesson35 minQuiz: refs, HEAD and the indexQuiz15 minRevision selection and history queries
- Naming commits: revision syntaxLesson30 min
- Commit ranges as set operationsLesson30 min
- git log as a query languageLesson35 min
- Diffs in depthLesson35 min
- Who changed this line: blame, shortlog and grepLesson30 min
- Navigating history quizQuiz15 min
Merging and conflict resolution in depth
- What a merge really doesLesson30 min
- Merge strategies and optionsLesson30 min
- Anatomy of a conflictLesson30 min
- Resolving by meaning, not by textLesson35 min
- The merge commit, undoing merges and preventing conflictsLesson35 min
- Merging in depth quizQuiz15 min
- Lab: resolve the gift wrap conflict and record the merge by handLab40 min
Rebase and rewriting history
- What rebase really doesLesson30 min
- Rebasing onto a branch and handling conflictsLesson30 min
- Interactive rebase: editing the planLesson35 min
- Splitting commits, autosquash, stacks and testing every commitLesson35 min
- Cherry-pick: copying single commitsLesson30 min
- Rewriting shared history safelyLesson35 min
- Chapter quiz: rebase and rewriting historyQuiz15 min
Recovering lost work
- A calm method for recovering lost workLesson30 min
- The reflog and ORIG_HEAD as recovery toolsLesson30 min
- Unreachable objects and lost uncommitted workLesson35 min
- Undoing common accidentsLesson35 min
- Lost stashes, garbage collection and time limitsLesson35 min
- Recovering lost work quizQuiz15 min
- Lab: recover Sam's lost branch and mainLab40 min
Stash, worktrees and bisect
- Stash as a workflow toolLesson30 min
- Worktrees: several branches checked out at onceLesson30 min
- Bisect: binary search through historyLesson35 min
- Automating bisect with git bisect runLesson30 min
- git grep and the pickaxe: searching instead of testingLesson30 min
- Quiz: stash, worktrees and bisectQuiz15 min
- Lab: build your own bisect runLab40 min
Remotes, refspecs and synchronisation
- What a remote is: configuration and refspecsLesson30 min
- Fetching by hand: objects, refs and FETCH_HEADLesson35 min
- Upstream tracking, push defaults and pull strategiesLesson35 min
- Tags, pruning and working with several remotesLesson35 min
- Transport, authentication and cloning lessLesson35 min
- Chapter quiz: remotes, refspecs and synchronisationQuiz15 min
Team workflows, pull requests and code review in depth
- Shared repositories, forks and staying currentLesson30 min
- Building a pull request people can reviewLesson30 min
- Reviewing code wellLesson35 min
- Responding to review: fixups, range-diff and patch seriesLesson30 min
- Merge methods and what they do to historyLesson30 min
- Protected branches, code owners and merge queuesLesson30 min
- Team workflows and code review quizQuiz15 min
Configuration, attributes and hooks
- Where git settings come fromLesson30 min
- Settings worth changing, and aliasesLesson30 min
- Attributes: rules that travel with the repositoryLesson35 min
- Client-side hooksLesson35 min
- Server-side hooks and real enforcementLesson35 min
- Chapter quiz: configuration, attributes and hooksQuiz15 min
- Lab: guard the storefront with hooks and attributesLab40 min
Releases, signing and large repositories
- Tags and version numbersLesson30 min
- git describe: naming any commit after a releaseLesson30 min
- Changelogs, release branches and backportsLesson35 min
- Signing commits and tagsLesson35 min
- Submodules, subtrees and dependenciesLesson30 min
- Large files and large repositoriesLesson35 min
- Quiz: releases, signing and large repositoriesQuiz15 min
Capstone: shipping storefront 1.1.0 and where next
- Planning storefront 1.1.0 as a teamLesson30 min
- The ISBN search pull request and its reviewLesson30 min
- Replaying the feature onto main and fast-forwardingLesson35 min
- Cutting the release: tag, changelog and describeLesson30 min
- Auditing the released history, and where nextLesson30 min
- Chapter quiz: shipping a releaseQuiz15 min
- Lab: ship storefront 1.1.0Lab40 min