From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Dec 2017 17:23:43 +0000 (-0800)
Subject: Merge branch 'sp/doc-info-attributes'
X-Git-Tag: v2.16.0-rc0~70
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f65ab574441f6ed9e59e50be68480bd698d9c749?ds=inline;hp=-c

Merge branch 'sp/doc-info-attributes'

Doc update.

* sp/doc-info-attributes:
doc: Mention info/attributes in gitrepository-layout
---

f65ab574441f6ed9e59e50be68480bd698d9c749
diff --combined Documentation/gitrepository-layout.txt
index adf9554ad2,5932868cef..c60bcad44a
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@@ -71,7 -71,7 +71,7 @@@ objects/info/packs:
  	This file is to help dumb transports discover what packs
  	are available in this object store.  Whenever a pack is
  	added or removed, `git update-server-info` should be run
 -	to keep this file up-to-date if the repository is
 +	to keep this file up to date if the repository is
  	published for dumb transports.  'git repack' does this
  	by default.
  
@@@ -208,6 -208,10 +208,10 @@@ info/exclude:
  	'git clean' look at it but the core Git commands do not look
  	at it.  See also: linkgit:gitignore[5].
  
+ info/attributes::
+ 	Defines which attributes to assign to a path, similar to per-directory
+ 	`.gitattributes` files.   See also: linkgit:gitattributes[5].
+ 
  info/sparse-checkout::
  	This file stores sparse checkout patterns.
  	See also: linkgit:git-read-tree[1].