From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 May 2015 21:39:39 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v2.5.0-rc0~118
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c518059b263bb506b96a0ae90c4d40408c760cb0?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Git 2.3.8
---

c518059b263bb506b96a0ae90c4d40408c760cb0
diff --combined Documentation/git.txt
index 2789da4f8f,55470aa880..42464c7af1
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -48,9 -48,10 +48,10 @@@ Documentation for older releases are av
  * release notes for
    link:RelNotes/2.4.0.txt[2.4].
  
- * link:v2.3.7/git.html[documentation for release 2.3.7]
+ * link:v2.3.8/git.html[documentation for release 2.3.8]
  
  * release notes for
+   link:RelNotes/2.3.8.txt[2.3.8],
    link:RelNotes/2.3.7.txt[2.3.7],
    link:RelNotes/2.3.6.txt[2.3.6],
    link:RelNotes/2.3.5.txt[2.3.5],
@@@ -833,15 -834,6 +834,15 @@@ Git so take care if using Cogito etc
  	an explicit repository directory set via 'GIT_DIR' or on the
  	command line.
  
 +'GIT_COMMON_DIR'::
 +	If this variable is set to a path, non-worktree files that are
 +	normally in $GIT_DIR will be taken from this path
 +	instead. Worktree-specific files such as HEAD or index are
 +	taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and
 +	the section 'MULTIPLE CHECKOUT MODE' in linkgit:checkout[1]
 +	details. This variable has lower precedence than other path
 +	variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
 +
  Git Commits
  ~~~~~~~~~~~
  'GIT_AUTHOR_NAME'::