From: Junio C Hamano Date: Sat, 24 Jun 2017 21:28:37 +0000 (-0700) Subject: Merge branch 'ah/doc-gitattributes-empty-index' X-Git-Tag: v2.14.0-rc0~66 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2bc81f2a83601ddfaad7d38406f819682f9cb756 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 --- 2bc81f2a83601ddfaad7d38406f819682f9cb756