It's been about a year since I sent a big update regarding our
activities with Conservancy. So I'm going to pretend that it was all a
plan to have an annual report, and this is the 2018 one. The previous
report can be found at:
Most people who work on the project know this already, but here's a
Git is a member project of the Software Freedom Conservancy. We joined
in 2010 so that Conservancy could help us manage our money and other
assets, and represent us for legal stuff like trademarks. Conservancy
doesn't hold any copyright on Git code, and our status as a member
project is totally disconnected from the development of the code. The
technical direction of the project is delegated back to Git.
A "Project Leadership Committee" (PLC) represents Git in Conservancy.
The PLC currently consists of Junio Hamano and me.
We have ~26k USD in our account. That's up ~5k from last year. Here are
the ledger numbers from the last year (it's double-entry, so negative is
$-89.91 Currency Conversion
$58.69 Currency Conversion
$176.98 Banking Fees
$225.00 Per Diem
Most of our money is taken in from donations. About 20% of it comes from
"royalties". Most of that is from the Amazon affiliate links on
git-scm.com (we link to the Pro Git book, but if people click through
and buy other stuff, that counts too). A little bit of the money comes
from Packt Publishing, who sends the project royalties based on sales of
their Git-related books. We give 10% of incoming money to Conservancy's
general fund (these numbers are after the 10%).
Our main expense was travel money for last year's Contributor Summit. It
looks like we spend a lot on banking fees and currency conversion, but
really those are just necessary parts of taking in the donations (e.g.,
somebody donates through paypal who charges a small cut to process the
We'll probably spend about the same amount this year for travel to Git
Merge (more on that below).
As I reported last year, we hold a trademark on the term "Git" in the
space of software and version control. I won't repeat all the details;
see last year's report.
There were a few requests this year from various entities; we mostly
followed the rules of thumb I laid out last year.
Subjectively, it felt like there were fewer requests this year than in
the past. I suspect last year's discussion may have gotten our trademark
policy a bit more attention (most of the previous requests are of the
form "I've been using the name "Git Foo" for my project and just found
out you don't want me to do so).
# Travel Budget Allocation
As with past years, we offered money for community members to come to
Git Merge (and the contributor summit). We've always sort of made up the
procedure each year, but this year tried to formalize it a little more.
Our procedure was basically:
0. We picked an amount that seemed OK to spend. For this year we
picked $2,000 (which admittedly is kind of made up).
1. I put out a call for requests to the mailing list.
2. For each request, I asked the requester to ballpark the cost of the
flight plus lodging to cover the conference.
3. We ordered the requests roughly by contribution history. We also
treated people in programs like GSoC and Outreachy as frequent
contributors. Even though they haven't contributed as much code
yet, the point of the program is getting them involved.
4. We walked down the list until we ran out of budget. At any given
level, the amount of money offered was tweaked manually based on
need/fairness (i.e., to offer more to people whose flights are more
This meant that we extended an offer of partial funds in some
cases (at the end of the line).
That whole procedure is totally open to comment and suggestions. There's
a huge amount of hand-waving and subjectivity there. It also doesn't
really work as a general procedure if somebody were to request one-off
funding for a conference besides Git Merge (which has never actually
happened so far).
# Project Governance
As many of you know, the third member of the PLC, Shawn Pearce, passed
away early this year. Our charter calls for a minimum of three PLC
members. New members are decided by a simple majority vote of the
existing committee (of which there are now 2 members, but Conservancy
has a tie-breaking vote if for some reason we deadlock).
Beyond that, there's no specified procedure. Junio and I have some
thoughts on candidates, but we want to open it up to the list for
discussion and possible nominations.
That's it for this year. I'm happy to answer any questions on the list,
and I'll propose a session at tomorrow's Contributor Summit in case
anybody wants to discuss it in person.