Merge branch 'jk/attributes-path-doc'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Mar 2018 18:30:15 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Mar 2018 18:30:15 +0000 (11:30 -0700)
Doc update.

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

1  2 
Documentation/gitattributes.txt

Simple merge