diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2017-04-12 11:48:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-13 22:53:41 (GMT) |
| commit | 85999743e74e35b9100cbeb94112a8ac39ab5a0e (patch) | |
| tree | f8ed9786fa9701fff7ae50f2fc3d1076ed795f1d /Documentation/gitattributes.txt | |
| parent | 49800c940790cc7465d1b03e08d472ffd8684808 (diff) | |
| download | git-85999743e74e35b9100cbeb94112a8ac39ab5a0e.zip git-85999743e74e35b9100cbeb94112a8ac39ab5a0e.tar.gz git-85999743e74e35b9100cbeb94112a8ac39ab5a0e.tar.bz2 | |
gitattributes.txt: document how to normalize the line endings
The instructions how to normalize the line endings should have been updated
as part of commit 6523728499e 'convert: unify the "auto" handling of CRLF',
(but that part never made it into the commit).
Update the documentation in Documentation/gitattributes.txt and add
a test case in t0025.
Reported by Kristian Adrup
https://github.com/git-for-windows/git/issues/954
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e0b66c1..0b03d91 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -227,11 +227,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" ------------------------------------------------- |