Git Magic

Git is a version control Swiss army knife. A reliable versatile multipurpose revision control tool whose extraordinary flexibility makes it tricky to learn, let alone master. As Arthur C. Clarke observed, any sufficiently advanced technology is indistinguishable from magic. This is a great way to approach Git: newbies can ignore its inner workings and view Git as a gizmo that can amaze friends and infuriate enemies with its wondrous abilities. Rather than describe one mysterious command after another, we provide recipes for typical workflows. After repeated use, you will inevitably gain proficiency with Git. Git Magic......Page 1 Table of Contents......Page 3 1. Thanks!......Page 6 2. License......Page 7 1.2. Version Control......Page 8 1.4. A Silly Superstition......Page 9 1.5. Merge Conflicts......Page 10 2.2. Add, Delete, Rename......Page 11 2.3. Advanced Undo/Redo......Page 12 2.5. Changelog Generation......Page 13 2.8. Instant Publishing......Page 14 2.10. Exercise......Page 15 3.2. Classic Source Control......Page 17 3.6. Forking a Project......Page 19 3.9. Guerilla Version Control......Page 20 3.10. Mercurial......Page 21 3.12. Why I use Git......Page 22 4.1. The Boss Key......Page 24 4.2. Dirty Work......Page 25 4.4. Merging......Page 26 4.5. Uninterrupted Workflow......Page 27 4.7. Managing Branches......Page 28 4.9. Work How You Want......Page 29 5.2. And Then Some......Page 30 5.5. Making History......Page 32 5.7. Who Made It All Go Wrong?......Page 34 5.8. Personal Experience......Page 35 6.2. Git Over SSH, HTTP......Page 36 6.4. Patches: The Global Currency......Page 37 6.5. Sorry, Weve Moved......Page 38 6.6. Remote Branches......Page 39 6.8. My Preferences......Page 40 7.3. My Commit Is Too Big!......Page 42 7.5. Dont Lose Your HEAD......Page 43 7.6. HEADhunting......Page 44 7.7. Building On Git......Page 45 7.8. Daring Stunts......Page 46 7.9. Preventing Bad Commits......Page 47 8.2. Integrity......Page 48 8.6. The Object Database......Page 49 8.8. Trees......Page 50 8.10. Indistinguishable From Magic......Page 52 A.4. Whos Editing What?......Page 54 A.7. Volatile Projects......Page 55 A.9. Empty Subdirectories......Page 56 A.11. Interface Quirks......Page 57 Appendix B. Translating This Guide......Page 58