Re: Git + SFC Status Update
- Written policy: https://git-scm.com/trademark My browser shows an Untrusted Connection page when click the link. Does git-scm have no TLS certificate? -- View this message in context: http://git.661346.n2.nabble.com/Git-SFC-Status-Update-tp7628669p7628850.html Sent from the git mailing list archive at Nabble.com. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git + SFC Status Update
On Thu, Apr 16, 2015 at 01:37:54AM -0700, Yi EungJun wrote: - Written policy: https://git-scm.com/trademark My browser shows an Untrusted Connection page when click the link. Does git-scm have no TLS certificate? Hmm, you're right. It has a *.herokuapp.com cert. That's fine for hitting https://git-scm.herokuapp.com, but obviously not when you use the custom domain. I think I manually accepted the cert long ago and forgot about it. Looks like somebody opened https://github.com/git/git-scm.com/issues/489 but nobody has dealt with it. I have no idea what the recommended setup is for dealing with TLS and custom domains on Heroku. -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git + SFC Status Update
On Tue, Apr 14, 2015 at 4:54 PM, Jeff King p...@peff.net wrote: On Tue, Apr 14, 2015 at 12:30:23PM -0700, Junio C Hamano wrote: If I recall correctly, Scott said onstage that some/all of the conference proceeds would be going directly into this fund. So this might need to be revised upward by 50-100% sometime soon :) I think you misheard it. The above is money earmarked for Git at SFC; the admission for GitMerge were going to SFC general fund without earmarked for us, IIUC. Yeah, that's my understanding as well. Ah, thanks for the clarification. -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git + SFC Status Update
Jeff King p...@peff.net writes: On Tue, Apr 14, 2015 at 12:30:23PM -0700, Junio C Hamano wrote: If I recall correctly, Scott said onstage that some/all of the conference proceeds would be going directly into this fund. So this might need to be revised upward by 50-100% sometime soon :) I think you misheard it. The above is money earmarked for Git at SFC; the admission for GitMerge were going to SFC general fund without earmarked for us, IIUC. Yeah, that's my understanding as well. To elaborate on this a bit more, there are two ways for people to support software freedom conservancy (SFC) by donation: - People can give money to the Git project, a member of the conservancy. 90% of that money will be earmarked for the Git project's use, and the rest goes to general fund to run SFC. The Donate button on http://git-scm.com/sfc goes to this pot. The Check option on http://git-scm.com/sfc can be directed to this way by earmarking the money for the Git project. - People can give money direct to the conservancy. The Check option on http://git-scm.com/sfc can be directed to this way by not earmarking the money for the Git project. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git + SFC Status Update
On Tue, Apr 14, 2015 at 12:30:23PM -0700, Junio C Hamano wrote: If I recall correctly, Scott said onstage that some/all of the conference proceeds would be going directly into this fund. So this might need to be revised upward by 50-100% sometime soon :) I think you misheard it. The above is money earmarked for Git at SFC; the admission for GitMerge were going to SFC general fund without earmarked for us, IIUC. Yeah, that's my understanding as well. -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git + SFC Status Update
On Mon, Apr 13, 2015 at 7:56 AM, Jeff King p...@peff.net wrote: # Money: How much do we have? - $19,059.25 (USD) // Disclaimer: this is not necessarily up-to-the-minute, as // SFC's reports to us sometimes lag a bit. And also because // I am fairly inexperienced using the `ledger` program, so // it's possible I've misinterpreted the results. However, we // shouldn't have any serious outstanding expenses, so this // is close to correct. If I recall correctly, Scott said onstage that some/all of the conference proceeds would be going directly into this fund. So this might need to be revised upward by 50-100% sometime soon :) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git + SFC Status Update
Dave Borowitz dborow...@google.com writes: On Mon, Apr 13, 2015 at 7:56 AM, Jeff King p...@peff.net wrote: # Money: How much do we have? - $19,059.25 (USD) // Disclaimer: this is not necessarily up-to-the-minute, as // SFC's reports to us sometimes lag a bit. And also because // I am fairly inexperienced using the `ledger` program, so // it's possible I've misinterpreted the results. However, we // shouldn't have any serious outstanding expenses, so this // is close to correct. If I recall correctly, Scott said onstage that some/all of the conference proceeds would be going directly into this fund. So this might need to be revised upward by 50-100% sometime soon :) I think you misheard it. The above is money earmarked for Git at SFC; the admission for GitMerge were going to SFC general fund without earmarked for us, IIUC. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Git + SFC Status Update
Here are the slides from my talk at Git Merge, along with the speaker notes and a few tidbits from the discussion that came afterwards. The talk was not recorded, so if you were there, please feel free to fill in details I've missed from the ensuing discussion. I'm sending the source format, since it has the notes and is easy to package in an email. If anybody really wants the rendered result, I can try to stick it somewhere (or finally get around to publishing my nasty rendering scripts). -- 8 -- # Git + Software Freedom Conservancy Overview Jeff Kingbr Git Mergebr April 8th, 2015 --- # Background - Software Freedom Conservancy is a not-for-profit organization to promote and help FLOSS projects. - Git joined as a member project in 2010 (The Git Project) - Primary motivation: legally handle GSoC money --- # Background (continued) - Conservancy is as close as Git gets to being a legal entity (e.g., holding monetary assets) - Conservancy does _not_ hold copyrights or have any control over the code - decisions are made by agreement of committee (Junio Hamano, Jeff King, Shawn Pearce) --- # Activities so far - money handling (GSoC and beyond) - holding domain names (git-scm.com, git-scm.org) - we own a Mac! - Git trademark // Actually, we don't technically have control over git-scm.com yet. // Scott Chacon has several times agreed to transfer it to us, but we // have not gone through with the actual transfer. We should probably do // that, as well as move the Heroku hosting for the site over to the // project, just to address any potential continuity issues (people // being hit by buses, etc). // // The Mac was purchased with money that was donated by GitHub, and is // held by Tim Harper, who uses it to make the OS X packages that are // linked from git-scm.com. Technically we own it and can ask for it // when we like. --- # Trademark - Written policy: https://git-scm.com/trademark - Informal goals: - avoid people pretending to be (or endorsed by) official git - avoid calling non-interoperable things git - Many names are OK or grandfathered (e.g., JGit, libgit2, Gitolite, Gitorious) // We have trademark both on the name Git and on the diamond logo. // GitHub is also a trademark, held by (surprise!) GitHub. We have an // agreement that both are OK, not confusing, and neither side will // annoy the other by claiming trademark infringement. --- # Money: How much do we have? - $19,059.25 (USD) // Disclaimer: this is not necessarily up-to-the-minute, as // SFC's reports to us sometimes lag a bit. And also because // I am fairly inexperienced using the `ledger` program, so // it's possible I've misinterpreted the results. However, we // shouldn't have any serious outstanding expenses, so this // is close to correct. --- # Money: Where does it come from? - 10% of everything we take in goes to Conservancy general fund; these numbers are actual inputs to Git account - Donations ($6577); we do not actively solicit, but people want to give us money - GSoC ($7236); this includes travel reimbursement money which flows through the project account; I believe $5500 is mentor stipend - Amazon affiliate links ($4255) - Packt Publishing royalties ($1724) // Disclaimer: these numbers were generated from a number of queries // that I performed manually against the ledger file. It's entirely // possible that I ended up missing some sources or double-counting // others. So please take the numbers as approximations, and if // somebody really wants to carefully audit the numbers, I can share // the source data. --- # Money: Where does it go? - Travel ($3692); all to GSoC mentor summit + GitTogether - Stickers ($135) - Trademark fees ($875); note that these are USPTO fees. The legal labor is provided by Conservancy. // Similar disclaimer on accuracy. // // The stickers were printed by me and handed out at a GSoC Mentor // Summit in 2011. --- center # Now what? That's the current state. Where do we want to go from here? --- # Governance (1/3) - Are we happy with the leadership structure? - Control of the project is held by committee, including power to remove or add people to committee. - Internal structure is up to us, not Conservancy. - Solicited opinions in 2010, and this is what we got. - Democracy is a hassle? - Still happy? // Keep in mind again that this is just The Git Project, holding // the money and any other assets. Not copyright on code, and with // no power over the day-to-day of the technical sides of the project. // // The current structure is essentially benevolent-committee-for-life. // We ended up with that because it was the simplest thing, and it // did not really seem to matter to anybody to do anything different. // I'm of the opinion that this is still the case, but I want to make it // clear that we are free to discuss alternatives without resorting to // violent revolution.
Re: Git + SFC Status Update
Thanks for the report, and thanks to everyone on the committee (and the conservancy). I'm somewhat disappointed to see that violent revolutions are excluded, though ;) Seriously, keeping the scope of The Git Project (the SCF member) as limited as it is seems to be the best approach to keeping it as hasslefree and fucntional as it is. Michael -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
