Merge branch 'ps/common-info-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:28:01 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:28:01 +0000 (13:28 -0800)
Doc fix.

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

Documentation/gitrepository-layout.txt
index 577ee844e0ed09e9f0339de55cf14a29ca7bdab2..a5f99cbb11ba3f7957b9fcd432354c08d99a32c1 100644 (file)
@@ -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