Painless Git
Painless Git
A Sane Person's Guide to Distributed Development
About the Book
Git is the lingua franca of team-based software development. And with good reason. Git is powerful, flexible, well-built, and battle hardened.
It can also be just a bit daunting. Merge conflicts pop up and litter your code with random rows of equal signs and angle brackets. You get great advice about rebasing instead of merging, which is a good idea except for those times where it's a bad idea. Stray too far into the weeds and you start hearing about "reflog" which sounds like "hitting someone again". that's no way to live.
Which is why I'm here. I've been teaching teams how to use git for about five years now, and trust me, I've seen every mess a team can get into with git.
Painless Git is a distillation of all the best git advice I've found over the years, helping you not only start using git, but start using it well. Once you've got a solid understanding of the basics of git, I'll help you build the confidence you need to find your way out of messes without resorting to the old "delete your working directory and start over" technique.
The Painless series is designed around developers who have a lot to do. I take it as read that you're intelligent and don't want to spend your time reading tech books. Painless Git is designed to be short, easy to read, and inexpensive, so you can learn how to manage distributed development quickly and get to work. I think you'll like this book and before too long you'll find that using git is actually fun, and learning it was, well, painless.
About the Author
Bundles that include this book
Table of Contents
-
-
Introduction
- What is git, and Why do I Need It?
- What This Book Aims to be
- What this book is not
- Who Am I?
- References
- Hey, Are There Any Conventions Used In this Book?
- Let’s “Git” Started!
-
How This Book is Structured
- What Are Interludes?
-
Introduction
-
Part I: Beginning
-
A Brief History of Git. The Briefest!
- The Linux Kernel
-
Installing Git
- Keeping Git up to Date
-
First Steps
- Creating a New Repository
- Quick Detour: Tell Git A Little About Yourself
- Okay, Back to Your First Commit
-
Fear of Commitment
- The Three Step Dance
- Staging Files
- What it Means to Commit
- The Anatomy of a Commit
- Pushing Git
-
Branching
- Branching: Split Apart
- Merging: Come Together
-
Branch Practice
- Learn Git Branching
- Extra Credit
-
Commits and Their Parents
- Terminology
-
Use Your
HEAD
-
Configuring and Ignoring
- Configuration: Here and Everywhere
- Ignore this text. Fnord.
- Git, Ignore!
-
.gitignoreis Bliss - Personalized Ignorance
-
Reaching Out: Working with Git Remotes
- Team Git Terminology
- Who Does Git Know?
- Two Remotes, No Waiting
-
Playing in the Sandbox
- The Github Option!
- The Non-Github Option
-
Interlude: Oops! I Broke Git!
- What Not To Do
- Reset or Revert
-
Conflict Resolution
- Artisanal, Hand-Crafted Fixes
- How Real People Resolve Git Conflicts
- In Either Case
-
Solo Git
- It’s Just Not That Hard
- It’s a Free Backup System
- Asking For Help Just Got Simpler
- You Can Try New Stuff
- Moving On
-
A Brief History of Git. The Briefest!
-
Part II: Refinement
-
Good Git Habits
- Commit Messages: Say Something Worth Saying
- Branch Names
-
Small Commits
- So How Often is “All the Time” In Practice?
- Worry About Merges, Not Commits
-
Branching Out
- Workflow 0: No Branching
- Workflow 1: Informal Branching
- Workflow 2: Autonomous Feature Branching
- Workflow 3: Formal Feature Branching
- Workflow 4: Git Flow
-
Good Git Hygiene
- Delete Old Branches
- Prune Frequently
- Taking out the Trash: Garbage Collection in git
-
Interlude A: Tools
- Git GUIs: Pretty Commit Trees!
- Diff/Merge Tools: Seeing What Changed, Fixing What Broke
- The Command Line!
-
Stashes: Quick, Hide Your Code!
- How to Actually Use Git Stash
- Refined
-
Good Git Habits
-
Part III: Sophistication
-
Use Sparingly: Git Commands You Should Use Less
- Amend: When What You Said Isn’t What You Meant
- Squash: Pretending History Didn’t Happen
- Rebase: Moving History
- Cherry-Pick: Moving One Commit to a New Branch
-
The Cases for and Against Bubbles
- The Case for Rebase
- Keeping the Mystery out of Your History
- The Verdict!
-
Delving Into
.git- The Directories
- Interlude: Selective Staging
-
Hooks
- Why would I want to do that?
-
Interlude: Commits Revisited
- First: Files in a Commit
- Second: Git Doesn’t Actually Store Files
- Third: Git Compresses
-
Getting the Elephant out of the Repo: Git’s Large File System
- Binary vs Text Files
- So Let’s Put Large Files Somewhere else!
- Then Follow The Directions!
- This Is All Easier if You Start Earlier
-
Shhh! We Are Talking About SSH!
- First off, What is SSH?
- What are the Benefits of Using SSH?
- Okay, Good Enough! How do I use it?
- Added Awesome
- Extra Awesome Non-Git Use of SSH
- Who Am Us, Anyway?
- Play It Again, Git: Using Git Rerere to Stop Repeating Yourself
-
It’s Ref-log, not Re-flog
- Show
- Expire
- Delete
- And That’s Pretty Much It!
- The End!
-
Use Sparingly: Git Commands You Should Use Less
-
Appendices
- Appendix B: Glossary
-
Appendix C: Terminal Velocity: Getting Up to Speed on the Command Line
- Tell Me What to Do: The Command
- Tell Me How to Do It: The Flags
- Tell Me What to Do It to: The Arguments
- Putting it All Together
- How do You Remember All This???
- Commands and Command Suites
- Unix-y Stuff
-
Appendix D: Commit or Commit-ish
- Specific References
- Relative References
-
Appendix E: SubGit
- Step 0: Bookmark the SubGit Documentation Page
- Step 1: Gather Information
- Initial Config
- Test! And Test Again!
-
About This Book
- About the Text
- About the Cover
- Special Thanks
- Notes
The Leanpub 60-day 100% Happiness Guarantee
Within 60 days of purchase you can get a 100% refund on any Leanpub purchase, in two clicks.
See full terms
Do Well. Do Good.
Authors have earned$12,130,341writing, publishing and selling on Leanpub, earning 80% royalties while saving up to 25 million pounds of CO2 and up to 46,000 trees.
Learn more about writing on Leanpub
Free Updates. DRM Free.
If you buy a Leanpub book, you get free updates for as long as the author updates the book! Many authors use Leanpub to publish their books in-progress, while they are writing them. All readers get free updates, regardless of when they bought the book or how much they paid (including free).
Most Leanpub books are available in PDF (for computers) and EPUB (for phones, tablets and Kindle). The formats that a book includes are shown at the top right corner of this page.
Finally, Leanpub books don't have any DRM copy-protection nonsense, so you can easily read them on any supported device.
Learn more about Leanpub's ebook formats and where to read them
Top Books
- #1
Ansible for DevOps
Jeff GeerlingAnsible is a simple, but powerful, server and configuration management tool. Learn to use Ansible effectively, whether you manage one server—or thousands.
- #2
Jetpack Compose internals
Jorge CastilloJetpack Compose is the future of Android UI. Master how it works internally and become a more efficient developer with it. You'll also find it valuable if you are not an Android dev. This book provides all the details to understand how the Compose compiler & runtime work, and how to create a client library using them.
- #3
Functional Programming Made Easier
Charles ScalfaniA Functional Programming book from beginner to advanced without skipping a single step along the way.
In my 40 years of programming, I've felt that programming books always let me down, especially Functional Programming books. So, I wrote the book I wish I had 5 years ago.
Functional Programming will never be easy, but it can be easier.
- #4
Windows 11 Field Guide
Rafael Rivera and Paul ThurrottThe Windows 11 Field Guide is a full-length e-book about the latest version of Microsoft Windows, aimed at those users who will upgrade from Windows 10 or acquire Windows 11 with a new PC.
- #5
C++20 - The Complete Guide
Nicolai M. JosuttisAll new language and library features of C++20 (for those who know previous C++ versions).
The book presents all new language and library features of C++20. Learn how this impacts day-to-day programming, to benefit in practice, to combine new features, and to avoid all new traps.
Buy early, pay less, free updates.
Other books:
- #6
Getting to Know IntelliJ IDEA
Trisha Gee and Helen ScottIf we treat our IDE as a text editor, we are doing ourselves a disservice. Using a combination of tutorials and a questions-and-answers approach, Getting to Know IntelliJ IDEA will help you find ways to use IntelliJ IDEA that enable you to work comfortably and productively as a professional developer.
- #7
The Art of Functional Programming
Minh Quang Tran, PhDA master class on the fundamentals and principles of functional programming. It contains 20 programming challenges with detailed solutions and 44 quizzes with answers and explanations. Moreover, 84 diagrams graphically illustrate how concepts and techniques work. Two real-world use cases show how to apply functional programming in practice.
- #8
R Programming for Data Science
Roger D. PengThis book brings the fundamentals of R programming to you, using the same material developed as part of the industry-leading Johns Hopkins Data Science Specialization. The skills taught in this book will lay the foundation for you to begin your journey learning data science. Printed copies of this book are available through Lulu.
- #9
Mastering STM32 - Second Edition
Carmine NovielloWith more than 1200 microcontrollers, STM32 is probably the most complete ARM Cortex-M platform on the market. This book aims to be the most complete guide around introducing the reader to this exciting MCU portfolio from ST Microelectronics and its official CubeHAL and STM32CubeIDE development environment.
- #10
Introducing EventStorming
Alberto BrandoliniThe deepest tutorial and explanation about EventStorming, straight from the inventor.
Top Bundles
- #2
CCIE Service Provider Ultimate Study Bundle
2 Books
Piotr Jablonski, Lukasz Bromirski, and Nick Russo have joined forces to deliver the only CCIE Service Provider training resource you'll ever need. This bundle contains a detailed and challenging collection of workbook labs, plus an extensively detailed technical reference guide. All of us have earned the CCIE Service Provider certification... - #3
1500 QUIZ COMMENTATI (3 libri)
3 Books
Tre libri dei QUIZ MMG Commentati al prezzo di DUE! I QUIZ dei concorsi ufficiali di Medicina Generale relativi agli anni: 2000-2001-2003-2012-2013-2014-2015-2016-2017-2018-2019-2020-2021 +100 inediti Raccolti in unico bundle per aiutarvi nello studio e nella preparazione al concorso. All'interno di ogni libro i quiz sono stati suddivisi per... - #4
Pattern-Oriented Memory Forensics and Malware Detection
2 Books
This training bundle for security engineers and researchers, malware and memory forensics analysts includes two accelerated training courses for Windows memory dump analysis using WinDbg. It is also useful for technical support and escalation engineers who analyze memory dumps from complex software environments and need to check for possible... - #5
Software Architecture
2 Books
"Software Architecture for Developers" is a practical and pragmatic guide to modern, lightweight software architecture, specifically aimed at developers. You'll learn:The essence of software architecture.Why the software architecture role should include coding, coaching and collaboration.The things that you really need to think about before... - #6
The Python Craftsman
3 Books
The Python Craftsman series comprises The Python Apprentice, The Python Journeyman, and The Python Master. The first book is primarily suitable for programmers with some experience of programming in another language. If you don't have any experience with programming this book may be a bit daunting. You'll be learning not just a programming... - #8
Growing Agile: The Complete Coach's Guide
7 Books
Growing Agile: Coach's Guide Series This bundle provides a collection of training and workshop plans for a variety of agile topics. The series is aimed at agile coaches, trainers and ScrumMasters who often find themselves needing to help teams understand agile concepts. Each book in the series provides the plans, slides, handouts and activity...
