diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:58:56 -0700 |
| commit | 86d51bbe1aacc7574241a33c3667581640a23841 (patch) | |
| tree | 316e78aab46ac3baa6c758aed9743e2ab90b3dad /Documentation | |
| parent | Merge branch 'da/mergetools-meld-output-opt-on-macos' into maint (diff) | |
| parent | doc: do not use `rm .git/index` when normalizing line endings (diff) | |
| download | tgif-86d51bbe1aacc7574241a33c3667581640a23841.tar.xz | |
Merge branch 'ah/doc-gitattributes-empty-index' into maint
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 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" |