From 8a7efa3958224300f73907433c752f6a9b60ba9c Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Wed, 28 Oct 2015 17:49:34 -0400
Subject: git page: make it less biased towards gisgendered men

---
(limited to 'site/git/index.php')

diff --git a/site/git/index.php b/site/git/index.php
index 598ddc7..aec5466 100644
--- a/site/git/index.php
+++ b/site/git/index.php
@@ -66,7 +66,8 @@
 				<p>
 					<?php echo gettext("Make sure that you configured git so that your name and email address appear in the commits that you create:"); ?><br/>
 					$ <b>git config --global user.name &quot;Your Name&quot;</b><br/>
-					$ <b>git config --global user.email your@emailaddress.com</b>
+					$ <b>git config --global user.email your@emailaddress.com</b><br/>
+					<b>NOTE: you don't have to use your legal name. We don't care what name you use.</b>
 				</p>
 				<p>
 					<?php echo gettext("The following is also useful:"); ?><br/>
@@ -90,7 +91,7 @@
 			<div>
 
 				<p>
-					<?php echo gettext("If you are modifying an existing file, then make sure to update the copyright license header in that file; in source files or scripts, this would usually be at the top, and for documentation it is typically at the bottom of the document. It is good practise to use your real name in the commit logs."); ?>
+					<?php echo gettext("If you are modifying an existing file, then make sure to update the copyright license header in that file; in source files or scripts, this would usually be at the top, and for documentation it is typically at the bottom of the document. Using your real name is not required. For reasons why we have this policy, read: <a href='http://geekfeminism.org/2012/09/29/quick-hit-how-git-shows-the-patriarchal-nature-of-the-software-industry/'>this page</a> (external link) - use of your legal name is *not* required. You can use an alias, or your company name (if you have a company), if you want."); ?>
 				</p>
 				<p>
 					<?php echo gettext("Generally speaking, using the same license as the file that you are modifying is much simpler."); ?>
@@ -122,7 +123,7 @@
 					$ <b>git config --global --add alias.lol &quot;log --graph --decorate --pretty=oneline --abbrev-commit --all&quot;</b><br/>
 					<?php echo gettext("From then on, you can use:"); ?><br/>
 					$ <b>git lol</b><br/>
-					<?php echo gettext("This is like <b>git log</b>, but on steroids."); ?>
+					<?php echo gettext("This is like <b>git log</b>, but it's much better and shows branches, etc."); ?>
 				</p>
 				<h3><?php echo gettext("Method 1: host a repository"); ?></h3>
 					<p>
--
cgit v0.9.1