Merge branch 'jc/exclusion-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 18:56:43 +0000 (10:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 18:56:43 +0000 (10:56 -0800)
* jc/exclusion-doc:
gitignore: document that unignoring a directory unignores everything in it

Trivial merge