How to normalize working tree line endings in Git?

by

For those using v2.16 or better, you can simply use:

git add --renormalize .  # Update index with renormalized files
git status               # Show the files that will be normalized
git commit -m "Introduce end-of-line normalization"

These directions are straight out of the gitattributes. For older versions, the docs
(prior to v2.12) provide a different answer:

rm .git/index     # Remove the index to force git to
git reset         # re-scan the working directory
git status        # Show files that will be normalized
git add -u
git add .gitattributes
git commit -m "Introduce end-of-line normalization"

Do this sequence after you have edited .gitattributes.

Update

It appears some users have had trouble with the above instructions. Updated docs for gitattributes (2.12 to 2.14) shows a new set of instructions (after editing the .gitattributes files):

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"

Thanks to @vossad01 for pointing this out.

Also, with either solution the files in your working copy still retain their old line endings. If you want to update them, make sure your working tree is clean and use:

git rm --cached -r .
git reset --hard

Now the line endings will be correct in your working tree.

More Related Contents:

  1. Trying to fix line-endings with git filter-branch, but having no luck
  2. git smudge/clean filter between branches
  3. Is it possible for git-merge to ignore line-ending differences?
  4. git diff – show me line ending changes?
  5. Definitive recommendation for git autocrlf settings
  6. How can I make git ignore future revisions to a file?
  7. Where should I place my global ‘gitattributes’ file?
  8. What are these ^M’s that keep showing up in my files in emacs?
  9. Break a previous commit into multiple commits
  10. git status shows modifications, git checkout — doesn’t remove them
  11. Git merge reports “Already up-to-date” though there is a difference
  12. How do I diff the same file between two different commits on the same branch?
  13. How can I get Git to follow symlinks?
  14. Prevent commits in master branch
  15. Install npm module from gitlab private repository
  16. Visual Studio Code cannot detect installed git
  17. How to update a git shallow clone?
  18. How to handle a large git repository?
  19. How can I view file history in Git?
  20. gitolite push error -> remote: ENV GL_RC not set
  21. Error: Cannot pull with rebase: You have unstaged changes
  22. Git refuses to reset/discard files
  23. How do I delete a local repository in git? [duplicate]
  24. Is there a way to cause git-reflog to show a date alongside each entry?
  25. Exclude file from “git diff”
  26. How to show Git log history (i.e., all the related commits) for a sub directory of a Git repository
  27. Get all files that have been modified in git branch
  28. Git: Set local user.name and user.email different for each repo
  29. How to set up git over http?
  30. unstaged files gone after git reset –hard

Leave a Comment