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.
C++ Best PracticesJason Turner
Level up your C++, get the tools working for you, eliminate common problems, and move on to more exciting things!
Digital-First EventsJoep Piscaer and Jana Boruta
The only resource you will ever need to launch your digital events program.
Algebra-Driven DesignSandy Maguire
A how-to field guide on building leak-free abstractions and algebraically designing real-world applications.
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.
R Programming for Data ScienceRoger D. Peng
This 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.
Continuous Delivery PipelinesDave Farley
This practical handbook provides a step-by-step guide for you to get the best continuous delivery pipeline for your software.
Cloud StrategyGregor Hohpe
“Strategy is the difference between making a wish and making it come true.” A successful migration to the cloud can transform your organization, but it shouldn’t be driven by wishes. This book tells you how to develop a sound strategy guided by frameworks and decision models without being overly abstract nor getting lost in product details.
node-opcua by exampleEtienne Rossignon
Get the best out of node-opcua through a set of documented examples by the author himself that will allow you to create stunning OPCUA Servers or Clients.
Technical leadership and the balance with agilitySimon Brown
A developer-friendly, practical and pragmatic guide to lightweight software architecture, technical leadership and the balance with agility.
Everyday Rails - RSpecによるRailsテスト入門Junichi Ito (伊藤淳一), AKIMOTO Toshiharu, 魚振江, and Aaron Sumner
RSpecを使ってRailsアプリケーションに信頼性の高いテストを書く実践的なアドバイスを提供します。詳細で丁寧な説明は本書のオリジナルコンテンツです。また、説明には実際に動かせるサンプルアプリケーションも使用します。本書は2017年版にアップデートされ、RSpec 3.6やRails 5.1といった新しい環境に対応しています！さあ、自信をもってテストできるようになりましょう！
Software Architecture for Developers: Volumes 1 & 2 - Technical leadership and communication
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...
CCIE Service Provider Ultimate Study Bundle
2 BooksPiotr 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...
Modern C++ by Nicolai Josuttis
Django for Beginners/APIs/Professionals
Modern Management Made Easy
3 BooksRead all three Modern Management Made Easy books. Learn to manage yourself, lead and serve others, and lead the organization.
Cisco CCNA 200-301 Complet
4 BooksCe lot comprend les quatre volumes du guide préparation à l'examen de certification Cisco CCNA 200-301.
2 BooksDocker and Kubernetes are taking the world by storm! These books will get you up-to-speed fast! Docker Deep Dive is over 400 pages long, and covers all objectives on the Docker Certified Associate exam.The Kubernetes Book includes everything you need to get up and running with Kubernetes!
The Python Craftsman
3 BooksThe Python Craftsman series comprises The Python Apprentice, The Python Journeyman, and The Python Master. The first book is primarily suitable for 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...
CCDE Practical Studies (All labs)
3 BooksCCDE lab
Linux Administration Complet
4 BooksCe lot comprend les quatre volumes du Guide Linux Administration :Linux Administration, Volume 1, Administration fondamentale : Guide pratique de préparation aux examens de certification LPIC 1, Linux Essentials, RHCSA et LFCS. Administration fondamentale. Introduction à Linux. Le Shell. Traitement du texte. Arborescence de fichiers. Sécurité...