Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ah/doc-gitattributes-empty-index'
author
Junio C Hamano
<gitster@pobox.com>
Sat, 24 Jun 2017 21:28:37 +0000
(14:28 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 24 Jun 2017 21:28:37 +0000
(14:28 -0700)
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
Documentation/gitattributes.txt
patch
|
blob
|
history
raw
(from parent 1:
5fd73da
)
diff --git
a/Documentation/gitattributes.txt
b/Documentation/gitattributes.txt
index 4736483865ee56c3cf23f41985e2064fbef0cfea..2a2d7e2a4d2a9cab2af8bd881dd880ca2a52235a 100644
(file)
--- 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"