diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 21:28:37 (GMT) |
| commit | 2bc81f2a83601ddfaad7d38406f819682f9cb756 (patch) | |
| tree | 19e6fd3bb72f1abd3291826a974998fc27792e5c /Documentation | |
| parent | 5fd73da391dca25c9022b51dbbc450e321a00e40 (diff) | |
| parent | 773a88914f7b951cb33b27b12b4b715b66451a07 (diff) | |
| download | git-2bc81f2a83601ddfaad7d38406f819682f9cb756.zip git-2bc81f2a83601ddfaad7d38406f819682f9cb756.tar.gz git-2bc81f2a83601ddfaad7d38406f819682f9cb756.tar.bz2 | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 4736483..2a2d7e2 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" |