Merge branch 'jh/clean-smudge-f-doc'
commit104985c59eb5f318daf6732af9a2b7a9f63d0857
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:43 +0000 (8 14:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Aug 2016 21:48:43 +0000 (8 14:48 -0700)
treecffe5e6bcb83ac6d2fbb687ab1d34a6344084417
parentffdcac4bc59a58fd0c4b99ce2d92c828c5b5fcae
parent52db4b0467f157230d2746f10435d070ad859bae
Merge branch 'jh/clean-smudge-f-doc'

A minor documentation update.

* jh/clean-smudge-f-doc:
  clarify %f documentation
Documentation/gitattributes.txt