diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-24 05:07:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-24 05:07:45 (GMT) |
| commit | 848d9a9bb7407cd3a2d45941f732b2ddc32588a7 (patch) | |
| tree | b8f6863c33bfd3a6b9a3286d798949c8730141b9 /Documentation/gitattributes.txt | |
| parent | 6b51cb61812c11915dbcc1d6daeee60ac77297de (diff) | |
| parent | 85999743e74e35b9100cbeb94112a8ac39ab5a0e (diff) | |
| download | git-848d9a9bb7407cd3a2d45941f732b2ddc32588a7.zip git-848d9a9bb7407cd3a2d45941f732b2ddc32588a7.tar.gz git-848d9a9bb7407cd3a2d45941f732b2ddc32588a7.tar.bz2 | |
Merge branch 'tb/doc-eol-normalization'
Doc update.
* tb/doc-eol-normalization:
gitattributes.txt: document how to normalize the line endings
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index a53d093..4736483 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -229,11 +229,9 @@ From a clean working directory: ------------------------------------------------- $ echo "* text=auto" >.gitattributes -$ rm .git/index # Remove the index to force Git to -$ git reset # re-scan the working directory +$ rm .git/index # Remove the index to re-scan the working directory +$ git add . $ git status # Show files that will be normalized -$ git add -u -$ git add .gitattributes $ git commit -m "Introduce end-of-line normalization" ------------------------------------------------- |