Skip to content

Commit 2bc81f2

Browse files
committed
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
2 parents 5fd73da + 773a889 commit 2bc81f2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Documentation/gitattributes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ From a clean working directory:
229229

230230
-------------------------------------------------
231231
$ echo "* text=auto" >.gitattributes
232-
$ rm .git/index # Remove the index to re-scan the working directory
232+
$ git read-tree --empty # Clean index, force re-scan of working directory
233233
$ git add .
234234
$ git status # Show files that will be normalized
235235
$ git commit -m "Introduce end-of-line normalization"

0 commit comments

Comments
 (0)