A Piece of Git
summary
Explains why line endings cause phantom changes and how to fix them: set a repository .gitattributes line like star text=auto, run git add --renormalize to update the index, and commit so everyone shares the same normalization; use merge -X renormalize for conflicted PRs and rebase -X renormalize (or cherry-pick-based rebase) to preserve changes. Shows how Git’s index cache and the recursive merge strategy create surprising conflicts and how the commands above resolve them.
AI-written summary · about
chapters (11)
- 0:00Intro
- 1:01Edward Thomson
- 3:37Git Internals
- 5:40Line Endings
- 14:08Line Ending Translation: Add
- 15:04Line Ending Translation: Checkout
- 19:37Index / Staging Area / Cache
- 36:49Merging Trees
- 39:00Merging Files: Conflicts
- 39:58MERGE HELL
- 50:44Rebase: Variations
