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?hp=5fd73da391dca25c9022b51dbbc450e321a00e40 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 --- diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 4736483865..2a2d7e2a4d 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -229,7 +229,7 @@ From a clean working directory: ------------------------------------------------- $ echo "* text=auto" >.gitattributes -$ rm .git/index # Remove the index to re-scan the working directory +$ git read-tree --empty # Clean index, force re-scan of working directory $ git add . $ git status # Show files that will be normalized $ git commit -m "Introduce end-of-line normalization"