From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Nov 2016 21:28:01 +0000 (-0800)
Subject: Merge branch 'ps/common-info-doc' into maint
X-Git-Tag: v2.10.3~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d92466ee25ca2dd79c6f0f7a804f765a5930990c?hp=e3c4323e23b59038c354ced895be7d9c2f3bbd4c

Merge branch 'ps/common-info-doc' into maint

Doc fix.

* ps/common-info-doc:
doc: fix location of 'info/' with $GIT_COMMON_DIR
---

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 577ee844e0..a5f99cbb11 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -177,7 +177,7 @@ sharedindex.<SHA-1>::
 info::
 	Additional information about the repository is recorded
 	in this directory. This directory is ignored if $GIT_COMMON_DIR
-	is set and "$GIT_COMMON_DIR/index" will be used instead.
+	is set and "$GIT_COMMON_DIR/info" will be used instead.
 
 info/refs::
 	This file helps dumb transports discover what refs are