Merge branch 'jk/attributes-path-doc' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 21:22:48 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 20 Mar 2018 21:22:49 +0000 (14:22 -0700)
Doc update.

* jk/attributes-path-doc:
doc/gitattributes: mention non-recursive behavior

1  2 
Documentation/gitattributes.txt
Simple merge