Practical Git : Confident Git Through Practice

Practice your Git skills using exercises in your own environment. This book introduces concepts in an abstract visual way, and then enforces this learning through exercises - the Git katas. You will start with basic interactions such as commits and branches, and move on to both internals and collaborative workflows. Best practices are introduced and rehearsed throughout with hands-on exercises. Each topic is supplemented with interactive Git exercises that can be solved using any Git client – either the ubiquituous CLI or one of the many graphical clients so you'll learn in the environment you work in. The importance of Git is hard to overstate – it is used by 90% of software engineers worldwide and is the de facto standard for version control. Honing your Git skills is guaranteed to make you a better and more efficient developer. Building software can be stressful, but it doesn’t need to be. __Practical Git__ will give you the Git skills you need, and help keep your Git skills sharp. Add it to your library today. **What You'll Learn** * Use Git through scripted exercises and the Git katas * Understand Git’s graph model * Troubleshoot common and rare scenarios you may face * Select and apply the right Git tool for the task * Maintain and collaborate on Git repositories * Tweak Git to gain the most from this powerful tool **Who This Book Is For** Anyone who is currently using Git in a copy-paste fashion. It will take you from using Git to knowing Git. Table of Contents 5 About the Author 9 About the Technical Reviewer 10 Foreword 11 Acknowledgments 13 Introduction 14 Chapter 1: Git Intuition 15 Version Control 15 Basic Git Concepts 17 The Repository 17 The Commit 19 The Branch and the Tag 20 The Tag 20 The Branch 21 Setting Up Git and the Git Katas 23 Git Clone 23 The .git Folder 24 Getting Our Bearings in a Repository 28 Git Status 28 Git Log 29 Summary 31 Chapter 2: Building Commits 32 What’s in a Workspace 32 Preparing Commits Using the Stage 35 Committing 42 Git Commit 42 Good, Bad, and UGLY Commit Messages 47 The Subject or Header 48 Recovering from Oops Moments with amend 51 Getting Clean Commits with .gitignore 53 Advanced .gitignore 55 Globbing git ignore 58 Git Katas 59 Summary 60 Chapter 3: Linear History 61 Branching Foundations 61 Keeping Track of Your HEAD 63 Committing on Your Branches 64 Checking Out a Previous Version 65 Seeing the Diff Between Different Versions 68 Git Katas 70 Summary 70 Chapter 4: Complex Branching 71 Creating Branches 71 Working with Multiple Branches 73 Merge 74 Fast-Forward Merges 74 Three-Way Merges 77 Merge Conflicts 80 Rebase 84 Tags 87 Detached HEAD 90 Git Katas 92 Summary 93 Chapter 5: Collaboration in Git 94 Working with Remotes 94 Cloning 96 Synchronizing with Remote 98 Simplified Workflow 100 Fork-Based Workflows 107 Pull Request–Based Workflows 115 Git Flow 116 Git Katas 117 Summary 117 Chapter 6: Manipulating History 118 Reverting Commits 118 Reset 121 Soft Reset 122 Mixed Reset 123 Hard Reset 124 Interactive Rebase 128 Git Katas 129 Summary 129 Chapter 7: Customizing Git 130 Configuring Git 130 Aliases 134 Attributes 136 Diff and Merge Tools 142 Hooks 146 Katas 148 Summary 149 Chapter 8: Additional Git Features 150 Git Bisect 150 Git Submodules 155 Git Large File Storage 165 Implementation 166 Tracking Files with Git LFS 167 Git Sizer 168 Converting a Repository to Git LFS 169 Git Katas 172 Summary 172 Chapter 9: Git Internals 173 The Git Graph 173 Commits 174 Trees 178 Blobs 179 References 181 Versioning with Trees 183 Katas 188 Summary 188 Index 189 Practice your Git skills using exercises in your own environment. This book introduces concepts in an abstract visual way, and then enforces this learning through exercises - the Git katas. You will start with basic interactions such as commits and branches, and move on to both internals and collaborative workflows. Best practices are introduced and rehearsed throughout with hands-on exercises. Each topic is supplemented with interactive Git exercises that can be solved using any Git client - either the ubiquituous CLI or one of the many graphical clients so you'll learn in the environment you work in. The importance of Git is hard to overstate - it is used by 90% of software engineers worldwide and is the de facto standard for version control. Honing your Git skills is guaranteed to make you a better and more efficient developer. Building software can be stressful, but it doesn't need to be. Practical Git will give you the Git skills you need, and help keep your Git skills sharp. Add it to your library today. You will: Use Git through scripted exercises and the Git katas ; Understand Git's graph model ; Troubleshoot common and rare scenarios you may face ; Select and apply the right Git tool for the task ; Maintain and collaborate on Git repositories ; Tweak Git to gain the most from this powerful tool