Merge branch 'ah/doc-gitattributes-empty-index'
commit2bc81f2a83601ddfaad7d38406f819682f9cb756
authorJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:37 +0000 (24 14:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 24 Jun 2017 21:28:37 +0000 (24 14:28 -0700)
tree19e6fd3bb72f1abd3291826a974998fc27792e5c
parent5fd73da391dca25c9022b51dbbc450e321a00e40
parent773a88914f7b951cb33b27b12b4b715b66451a07
Merge branch 'ah/doc-gitattributes-empty-index'

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