How to Git Away with Murder
summary
Claim: Git stores immutable snapshots in a content-addressed object DB and branches are just pointers to commit hashes. Practical tools demonstrated: feature branches, small atomic commits, squash, git commit --amend, git interactive rebase, reset vs revert, and git reflog for recovering recent lost commits (roughly within a few months). Shocking outcomes: a 3‑month parallel rewrite creates merge conflicts that take two days to reconcile; another team faces ~1000 conflicts and must restart. Rules: never force-push shared history; use protected branches and pull‑request reviews.
AI-written summary · about
chapters (10)
- 0:00Introduction to Git crimes
- 4:49Understanding Git internals
- 14:08Best practices for Git
- 20:25Fixing commits and history
- 24:10Advanced Git history editing
- 27:45Reset versus Revert
- 30:46Recovering lost work
- 32:34Handling merge conflicts
- 36:21The dangers of force push
- 40:09Prevention and conclusion
related talks
27mModern Source and Version Control with Git
37mConflict resolution
50mUnderstanding Git's Behaviour
24mSo you think you know Git. Advanced Git Tips and Tricks
47mSo you think you know Git: Advanced Git Tips and Tricks
45m~/git --help
46mGit internals: Why trees are a developer's best friend
28mOn Omitting Commits and Committing Omissions: Preventing Git Metadata...