From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:58:56 +0000 (-0700)
Subject: Merge branch 'ah/doc-gitattributes-empty-index' into maint
X-Git-Tag: v2.13.3~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86d51bbe1aacc7574241a33c3667581640a23841;p=thirdparty%2Fgit.git

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
---

86d51bbe1aacc7574241a33c3667581640a23841