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
Authors have earned$10,260,929writing, 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
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.
Learn more about Leanpub's ebook formats and where to read them
Top Books
- #1
500 QUIZ MMG COMMENTATI
ALS Medicina Generale500 Quiz degli ULTIMI Concorsi di Medicina Generale (2014/2016/2017/2018/2019)
Riassunti e suddivisi per area con Griglia risposte vuota e Griglia risposte esatte Ministeriale
Commentati con link alla fonte per approfondimento e ausilio allo studio
- #2
C++20
Rainer GrimmC++20 is the next big C++ standard after C++11. As C++11 did it, C++20 changes the way we program modern C++. This change is, in particular, due to the big four of C++20: ranges, coroutines, concepts, and modules.
- #3
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.
- #4
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.
- #5
C++ Best Practices
Jason TurnerLevel up your C++, get the tools working for you, eliminate common problems, and move on to more exciting things!
- #6
Visualise, document and explore your software architecture
Simon BrownA short guide to visualising, documenting and exploring your software architecture.
- #7
Atomic Kotlin
Bruce Eckel and Svetlana IsakovaFor both beginning and experienced programmers! From the author of the multi-award-winning Thinking in C++ and Thinking in Java together with a member of the Kotlin language team comes a book that breaks the concepts into small, easy-to-digest "atoms," along with exercises supported by hints and solutions directly inside IntelliJ IDEA!
- #8
Continuous Delivery Pipelines
Dave FarleyThis practical handbook provides a step-by-step guide for you to get the best continuous delivery pipeline for your software.
- #9
Functional Design and Architecture
Alexander GraninSoftware 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.
- #10
Technical leadership and the balance with agility
Simon BrownA developer-friendly, practical and pragmatic guide to lightweight software architecture, technical leadership and the balance with agility.
Top Bundles
- #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... - #2
Software Architecture and Design Practice Reference
2 Books
Dive deeper in Software Architecture with the Design Practice Reference. Learn all about software architecture and design from the books in this bundle:Software Architecture covers topics from quality attributes to designing and modeling components, interfaces, connectors, and containers, all the way to services and microservices. The Design... - #5
Linux Administration Complet
4 Books
Ce 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é... - #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 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
All the Books of The Medical Futurist
6 Books
We put together the most popular books from The Medical Futurist to provide a clear picture about the major trends shaping the future of medicine and healthcare. Digital health technologies, artificial intelligence, the future of 20 medical specialties, big pharma, data privacy, digital health investments and how technology giants such as Amazon... - #9
Mastering Containers
2 Books
Docker 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!
