From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Dec 2012 19:13:56 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.1-rc2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/790c83cda92f95f1b4b91e2ddc056a52a99a055d?ds=inline;hp=-c

Merge branch 'maint'
---

790c83cda92f95f1b4b91e2ddc056a52a99a055d
diff --combined Documentation/git.txt
index 25e2f3a60e,60db2929b5..1d797f27ed
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -650,6 -650,7 +650,7 @@@ git so take care if using Cogito etc
  	If the 'GIT_DIR' environment variable is set then it
  	specifies a path to use instead of the default `.git`
  	for the base of the repository.
+ 	The '--git-dir' command-line option also sets this value.
  
  'GIT_WORK_TREE'::
  	Set the path to the working tree.  The value will not be
@@@ -869,10 -870,7 +870,10 @@@ Author
  -------
  Git was started by Linus Torvalds, and is currently maintained by Junio
  C Hamano. Numerous contributions have come from the git mailing list
 -<git@vger.kernel.org>.  If you have a clone of git.git itself, the
 +<git@vger.kernel.org>.  http://www.ohloh.net/p/git/contributors/summary
 +gives you a more complete list of contributors.
 +
 +If you have a clone of git.git itself, the
  output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you
  the authors for specific parts of the project.