Puppet’s dozens of Git repositories see new code commits every day from more than 200 people, says Michael Stahnke, director of engineering services at Puppet Labs. And he personally uses the open source revision control system several times a day.

“I can’t think of another tool that changed the way I work, in a positive way, more than git,” Stahnke said.

In this Q&A celebrating Git’s 10-year anniversary this week, Stahnke shared why Puppet Labs uses Git, their Git success stories, and his top pro tip for using the tool. For more in our “Git Week” series, see our interviews, below, with Git creator Linus Torvalds, and project maintainers from KVM, Qt, Drupal, and Tor.

Linux.com: Why does Puppet use Git?

Michael Stahnke: We have about 150 people in engineering and another 70-100 in roles where slinging code is certainly an expectation of the job. When you have people working around the world, you need a DVCS. When you need a DVCS, you use git. Puppet (the project) moved to git in 2007, when it was just a single developer doing nearly all the coding. But the tools git provides, such as the ability to commit work on an airplane, were immediately of use.

What makes Git such a great tool?

First, cheap merges. They usually advertise cheap branching as a thing you want. I actually want cheap merges, because that’s where the trouble lies. Beyond that, it’s flexibility. We’ve done mailing list patches, we’ve used pull requests, we’ve done merges with rerere. Rebasing to make commits and branches have a clean history with messages that make sense is hugely helpful for experiments.

How many developers do you have collaborating on Git?

I think we have about 230 people using our git repos on a regular basis. We have just north of 1,000 repos in our organization on github. We manage everything from our software, to documentation to educational materials using git.

How much do you personally use it?

Personally, I use git several times a day. I’d guess I make somewhere between 2 and 20 commits a day on average (and I’m a manager).

What’s Puppet’s most active git repo right now and why?

I’m not sure what the best metric is to use for activity, but we have dozens (probably around 100) repos that basically see commits daily. Puppet is very active, as is beaker our testing framework, puppet-server, PuppetDB and lots of Puppet modules.

What is your favorite pro tip for using Git?

Version your projects using `git describe`. If you use tags, you can use ‘git describe’ to version things when doing scratch builds. We do this on nearly all of our projects in our build pipelines. It takes the guess work out of the build process and unlike just using a raw sha, it sorts properly.

Any Git success stories you can share?

When you have meaningful commit messages, everybody’s life is better. Often you can figure what was changed from the diff, but why it was changed is what’s needed in the commit message. In our commit messages we look for why something changed, how did it used to work and how does it work now. We’re pretty medieval about commit messages. The person reading those messages will appreciate the effort you put into them, even if that person is future-you. We often start our release notes by reading the commit messages for the projects.

Anything else you’d like to say to mark the 10-year anniversary?

I can’t think of another tool that changed the way I work, in a positive way, more than git.  

Read more Git Week profiles:

Git Success Stories and Tips from Wine Maintainer Alexandre Julliard

Git Success Stories and Tips from Tor Chief Architect Nick Mathewson

Git Success Stories and Tips from Drupal Core Committer Angie Byron

Git Success Stories and Tips from Qt Maintainer Thiago Macieira

Git Success Stories and Tips from KVM Maintainer Paolo Bonzini

10 Years of Git: An Interview with Git Creator Linus Torvalds

Tor, the free and open source software for anonymous web communications, has been using the Git revision control system for more than six years. The tool is so ingrained in the project’s development that Director and Chief Architect Nick Mathewson’s daily work flow is built around Git, he says.

“Git’s the eighth version control system I’ve had to use, and the first one I’ve seriously trusted,” Mathewson said. “Many thanks to the Git developers for all their hard work.”

In celebration of Git’s 10-year anniversary this week, Mathewson shared why the Tor Project uses Git, their Git success stories, and his pro tips for using the tool. For more in our “Git Week” series, see our interviews, below, with Git creator Linus Torvalds, and project maintainers from KVM, Qt, and Drupal, with more to come tomorrow.

Linux.com: Why does Tor use Git?

Nick Mathewson: We switched to Git from SVN in 2009 because we wanted offline development, distributed development, and merging to work. We need to manage a few stable and unstable releases simultaneously, and we frequently apply feature patches that require multiple revisions and long, complex branches. For both of these cases, having robust support for merging was valuable.

We picked Git over the other options because it seemed to be gaining the most mindshare among developers. That still seems to be the case.

What makes Git such a great tool?

It’s obviously designed by programmers who made it to use it themselves, and who understand that even in the sleekest version control system, you often need to get under the hood and access raw internals.

How many developers do you have collaborating on Git?

Our git repositories contain commits from hundreds of developers. (See gitweb.torproject.org for more information.)

How much do you personally use it?

I use Git every day; my workflow is built around it.

What’s Tor’s most active Git repo right now and why?

For group projects, I’d guess that would be either the repository for the Tor program itself, or the repository for the Tor Browser, mainly because those have the most developers.

What is your favorite pro tip for using git?

I’ve attached a script I use to squash git commits without rebasing them. This makes the squash commits happen, but prevents (most) rebase conflicts.

And here is my favorite non-pro tip for Git:

alias such=git alias very=git alias wow=’git status’ $ wow $ such commit $ very push

— Chris Martin (@chris__martin) January 8, 2014

Any git success stories you can share?

A little while ago, I needed to decide what parts of Tor we should prioritize testing on. I guessed that functions which change frequently over time, and which get changed by many people, are likelier to have bugs than ones which didn’t. So I wrote a little python script to parse git blame and git log -p output, and had a full analysis of our change frequency by function since 2002.

On a more prosaic note, my sister lives out in the woods and has no reliable internet connection. Git enables me to get work done when I’m visiting here, which was nigh-impossible back before we had offline operation.

Anything else you’d like to say to mark the 10-year anniversary?

Git’s the eighth version control system I’ve had to use, and the first one I’ve seriously trusted. Many thanks to the Git developers for all their hard work.

Read more Git Week profiles:

Git Success Stories and Tips from Wine Maintainer Alexandre Julliard

Git Success Stories and Tips from Puppet Labs’ Michael Stahnke

Git Success Stories and Tips from Drupal Core Committer Angie Byron

Git Success Stories and Tips from Qt Maintainer Thiago Macieira

Git Success Stories and Tips from KVM Maintainer Paolo Bonzini

10 Years of Git: An Interview with Git Creator Linus Torvalds