Merge branch 'ah/doc-gitattributes-empty-index'
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:37 +0000 (14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:37 +0000 (14:28 -0700)
An example in documentation that does not work in multi worktree
configuration has been corrected.

* ah/doc-gitattributes-empty-index:
doc: do not use `rm .git/index` when normalizing line endings

Trivial merge