A Piece of Git

Explore the intricacies and peculiarities of Git in this 57-minute conference talk by Edward Thomson at NDC Conferences. Delve into the inner workings of Git, examining its seemingly organized structure of blobs, trees, commits, and refs. Uncover the reasons behind Git's unique features, such as the three different types of rebase, the recursive nature of merge, and the complexities of line ending normalization. Gain insights into Git's idiosyncrasies and understand the rationale behind its functionality. Topics covered include Git internals, line endings and their translation, the index/staging area/cache, merging trees and files, conflict resolution, and various rebase techniques.

Intro
Edward Thomson
Git Internals
Line Endings
Line Ending Translation: Add
Line Ending Translation: Checkout
Index / Staging Area / Cache
Merging Trees
Merging Files: Conflicts
MERGE HELL
Rebase: Variations