5. Lessons of History................................................................................................................................23
5.1. I Stand Corrected ......................................................................................................................23
5.2. . . . And Then Some...................................................................................................................23
5.3. Local Changes Last...................................................................................................................24
5.4. Rewriting History......................................................................................................................25
5.5. Making History .........................................................................................................................25
5.6. Where Did It All Go Wrong?....................................................................................................27
5.7. Who Made It All Go Wrong? ...................................................................................................27
5.8. Personal Experience..................................................................................................................28
6. Multiplayer Git ....................................................................................................................................29
6.1. Who Am I?................................................................................................................................29
6.2. Git Over SSH, HTTP ................................................................................................................29
6.3. Git Over Anything.....................................................................................................................30
6.4. Patches: The Global Currency ..................................................................................................30
6.5. Sorry, We’ve Moved..................................................................................................................31
6.6. Remote Branches ......................................................................................................................32
6.7. Multiple Remotes......................................................................................................................33
6.8. My Preferences .........................................................................................................................33
7. Git Grandmastery................................................................................................................................35
7.1. Source Releases.........................................................................................................................35
7.2. Commit What Changed.............................................................................................................35
7.3. My Commit Is Too Big!............................................................................................................35
7.4. The Index: Git’s Staging Area ..................................................................................................36
7.5. Don’t Lose Your HEAD............................................................................................................36
7.6. HEAD-hunting ..........................................................................................................................37
7.7. Building On Git.........................................................................................................................38
7.8. Daring Stunts.............................................................................................................................39
7.9. Preventing Bad Commits ..........................................................................................................39
8. Secrets Revealed...................................................................................................................................41
8.1. Invisibility .................................................................................................................................41
8.2. Integrity.....................................................................................................................................41
8.3. Intelligence................................................................................................................................41
8.4. Indexing.....................................................................................................................................42
8.5. Git’s Origins..............................................................................................................................42
8.6. The Object Database .................................................................................................................42
8.7. Blobs .........................................................................................................................................42
8.8. Trees ..........................................................................................................................................43
8.9. Commits ....................................................................................................................................44
8.10. Indistinguishable From Magic ................................................................................................45
A. Git Shortcomings ................................................................................................................................47
A.1. SHA1 Weaknesses....................................................................................................................47
A.2. Microsoft Windows..................................................................................................................47
A.3. Unrelated Files .........................................................................................................................47
A.4. Who’s Editing What?...............................................................................................................47
A.5. File History...............................................................................................................................48
A.6. Initial Clone..............................................................................................................................48
iv
