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.
- What is git, and Why do I Need It?
- What This Book Aims to be
- What this book is not
- Who Am I?
- Hey, Are There Any Conventions Used In this Book?
- Let’s “Git” Started!
How This Book is Structured
- What Are Interludes?
Part I: Beginning
A Brief History of Git. The Briefest!
- The Linux Kernel
- Keeping Git up to Date
- 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: Split Apart
- Merging: Come Together
- Learn Git Branching
- Extra Credit
Commits and Their Parents
Configuring and Ignoring
- Configuration: Here and Everywhere
- Ignore this text. Fnord.
- Git, Ignore!
- 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
- Artisanal, Hand-Crafted Fixes
- How Real People Resolve Git Conflicts
- In Either Case
- 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
- So How Often is “All the Time” In Practice?
- Worry About Merges, Not Commits
- 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
- 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!
- The Directories
- Interlude: Selective Staging
- 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
- And That’s Pretty Much It!
- The End!
- Use Sparingly: Git Commands You Should Use Less
- 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
The Leanpub 45-day 100% Happiness Guarantee
Within 45 days of purchase you can get a 100% refund on any Leanpub purchase, in two clicks.
See full terms
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), EPUB (for phones and tablets) and MOBI (for 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.
Ansible for KubernetesJeff Geerling
Ansible is a powerful infrastructure automation tool. Kubernetes is a powerful application deployment platform. Learn how to use these tools to automate massively-scalable, highly-available infrastructure.
Practical FP in Scala: A hands-on approachGabriel Volpe
A practical book aimed for those familiar with functional programming in Scala who are yet not confident about architecting an application from scratch.
Together, we will develop a purely functional application using the best libraries in the Cats ecosystem, while learning about design patterns and best practices.
Functional Design and ArchitectureAlexander Granin
Software Design in Functional Programming, Design Patterns and Practices, Methodologies and Application Architectures. How to build real software in Haskell with less efforts and low risks. The first complete source of knowledge.
Production HaskellMatt Parsons
Are you excited about Haskell, but don't know where to begin? Are you thrilled by the technical advantages, but worried about the unknown pitfalls? This book has you covered.
Tame your Work FlowSteve Tendon and Daniel Doiron
Do you need a high performance enterprise governance approach improving management, execution and delivery while dealing with multiple projects/products, events, stakeholders and teams? Giving you better bottom line results, faster time to market, less work, better predictability, happier employees, and delighted clients? Then learn about TameFlow!
Ansible for DevOpsJeff Geerling
Ansible is a simple, but powerful, server and configuration management tool. Learn to use Ansible effectively, whether you manage one server—or thousands.
Machine Learning EngineeringAndriy Burkov
"If you intend to use machine learning to solve business problems at scale, I'm delighted you got your hands on this book."
—Cassie Kozyrkov, Chief Decision Scientist at Google
"Foundational work about the reality of building machine learning models in production."
—Karolis Urbonas, Head of Machine Learning and Science at Amazon
C++ Best PracticesJason Turner
Level up your C++, get the tools working for you, eliminate common problems, and move on to more exciting things!
Composing SoftwareEric Elliott
All software design is composition: the act of breaking complex problems down into smaller problems and composing those solutions. Most developers have a limited understanding of compositional techniques. It's time for that to change.
El Manual del ManagerKeyvan Akbary, Félix López, and Álvaro Salazar
¿Has deseado alguna vez el haber tenido una buena introducción al rol del Engineering Manager? En este libro aprenderás lo necesario para ejercer el rol de una manera efectiva: Expectativas y Responsabilidades del Rol, 1-1s, Ayudar a Crecer, Objetivos, Planes de Carrera, Cultura, Feedback, Contratación, Cultura de Producto y mucho más.
The Tester's Library
8 BooksThe Tester's Library consists of eight five-star books that every software tester should read and re-read. As bound books, this collection would cost over $200. Even as e-books, their price would exceed $80, but in this bundle, their cost is only $49.99. Here are the books, and why they should be in your library: Perfect Software and Other...
11 BooksIn this bundle, you will find 10 different agile books. They are about different aspects of being agile. - finding a job - doing coding dojo's - Retrospectives - Personal kanban - a non-typical coaching book and even a book that gives you an insight in the lives of some agile people.
WTFlop 6M + HU - Beta Bundle
Marionette.js A to Z
Build A Better Backbone App
3 BooksThe best way to learn new development skills is through experience, but that takes time you don't have.Get the best of both worlds with this bundle: you'll learn how to produce modern web applications by learning from experienced developers like Derick Bailey and David Sulc. BackboneJS is one of the favorite tools on the web today, but it...
General Systems Thinker Bundle
5 BooksThe General Systems Thinker Bundle is just that: a bundle of five books to advance the reader one giant step toward improved thinking, based on General Systems principles. Four of the books are the complete General Systems Series. The fifth is fictional piece which shows some general systems thinkers in action. It's a mystery in which a group of...
Experiential Learning Bundle
4 BooksThis bundle provides all four volumes of the popular Experiential Learning Series at a savings of $20 over the price if purchased separately.
2 BooksAfter getting up and running with Ansible in Jeff Geerling's Ansible for DevOps, strengthen your skills managing tens to thousands of instances and services in Amazon's AWS cloud with Yan Kurniawan's Ansible for AWS.
Learn ECMAScript 6 inside and out
2 BooksFor any technology, it helps to get multiple points of view on the functionality to get the best possible understanding. For ECMAScript 6/2015, no two resources are recommended more frequently thanExploring ES6by Dr. Axel Rauschmayer andUnderstanding ECMAScript 6by Nicholas C. Zakas. These two points of view, investigating the specification and...
Software architecture, for systems old and new
2 BooksThis bundle includes books about hands-on software architecture.