Painless Git
Painless Git
Minimum price
Suggested price
Painless Git

This book is 20% complete

Last updated on 2019-04-03

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

Nate Dickson
Nate Dickson

Nate Dickson is a professional programmer by day, working for a large non-profit organization in the tops of the Rocky Mountains. By night he makes fun of all things Apple, writes about the best things ever, maintains a personal blog, and contributes to various open source projects. Nate lives in a cozy little suburb with his wife, kids, and a dog that's bigger than most sheep. It's a good life.

Bundles that include this book

Painless Vim
Painless Git
Painless Tmux
Suggested Price
Bundle Price

Table of Contents

    • This is Painless Git alpha.
      • Roadmap
    • Preface
      • Why? Why This?
    • 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?
  • Part I: Beginning
    • A Brief History of Git. The Briefest!
      • The Linux Kernel
    • Installing Git{#InstallingGit}
      • 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 YourHEAD
    • Configuring and Ignoring
      • Configuration: Here and Everywhere
      • Ignore this text. Fnord.
      • Git, Ignore!
      • .gitignore is Bliss
      • Personalized Ignorance
    • Reaching Out: Working with Git Remotes
      • Team Git Terminology
      • Reaching Out: Remote Git
      • 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
    • Moving On
  • 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
    • Wandering Without Getting Lost
    • Stashes: Quick, Hide Your Code!
    • Distribution and Decentralization
    • Interlude: The Backwards Arrows
    • More Branch Practice
  • Part III: Sophistication
    • Use Sparingly: Git Commands You Should Use Less
      • Amend: When What You Said Isn’t What You Meant
      • Rebase: Moving History
      • Cherry-Pick: Moving One Commit to a New Branch
    • The Cases for and Against Bubbles
      • Keeping the Mystery out of Your History
      • The Case for Rebase
    • 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
    • Delving Into .git
    • Hooks
    • Commits Revisited
    • Getting the Elephant out of the Repo: Git’s Large File System
    • Solo Git
    • Be Our Guest: Choosing a Host for Git
    • Who Am Us, Anyway?
    • Useful Commands with Funny Names
      • Rerere
      • Bisect
      • Reflog
    • Glossary
    • Appendix A: References
    • 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
    • Commit or Commit-ish
      • Specific References
      • Relative References
    • SubGit
    • About This Book
      • About the Text
      • About the Cover
      • Special Thanks
  • Notes

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...

Write and Publish on Leanpub

Authors, publishers and universities use Leanpub to publish amazing in-progress and completed books and courses, just like this one. You can use Leanpub to write, publish and sell your book or course as well! Leanpub is a powerful platform for serious authors, combining a simple, elegant writing and publishing workflow with a store focused on selling in-progress ebooks. Leanpub is a magical typewriter for authors: just write in plain text, and to publish your ebook, just click a button. It really is that easy.

Learn more about writing on Leanpub