Merge branch 'ah/doc-gitattributes-empty-index' into maint
commit86d51bbe1aacc7574241a33c3667581640a23841
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:58:56 +0000 (10 13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 20:58:56 +0000 (10 13:58 -0700)
tree316e78aab46ac3baa6c758aed9743e2ab90b3dad
parent311b760b8f158fe9db633301469ab4b58447542f
parent773a88914f7b951cb33b27b12b4b715b66451a07
Merge branch 'ah/doc-gitattributes-empty-index' into maint

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