Line endings messed up in Git – how to track changes from another branch after a huge line ending fix?

by

I finally managed to solve it.

The answer is:

git filter-branch --tree-filter '~/Scripts/fix-line-endings.sh' -- --all

fix-line-endings.sh contains:

#!/bin/sh
find . -type f -a \( -name '*.tpl' -o -name '*.php' -o -name '*.js' -o -name '*.css' -o -name '*.sh' -o -name '*.txt' -iname '*.html' \) | xargs fromdos

After all line endings were fixed in all trees in all commits, I did an interactive rebase and removed all commits that were fixing line endings.

Now my repo is clean and fresh, ready to be pushed 🙂

Note to visitors: do not do this if your repo has been pushed / cloned because it will mess things up badly!

More Related Contents:

  1. Branch from a previous commit using Git
  2. What exactly do we mean by “branch”?
  3. How do I clone a single branch in Git?
  4. Default behavior of “git push” without a branch specified
  5. Track all remote git branches as local branches
  6. How line ending conversions work with git core.autocrlf between different operating systems
  7. Using the slash character in Git branch name
  8. Why do I have to “git push –set-upstream origin “?
  9. Vendor Branches in Git
  10. How can I search Git branches for a file or directory?
  11. Forking vs. Branching in GitHub
  12. How do I get the current branch name in Git?
  13. How do I delete all Git branches which have been merged?
  14. How do I merge my local uncommitted changes into another Git branch?
  15. How to commit my current changes to a different branch in Git [duplicate]
  16. Pull a certain branch from the remote server
  17. Reordering of commits
  18. Does deleting a branch in git remove it from the history?
  19. How do you remove an invalid remote branch reference from Git?
  20. Git branch strategy for small dev team [closed]
  21. Delete local Git branches after deleting them on the remote repo
  22. How to protect “master” in github?
  23. How to get default Git branch?
  24. What are these ^M’s that keep showing up in my files in emacs?
  25. Pull all commits from a branch, push specified commits to another
  26. View differences of branches with meld?
  27. How do I manage conflicts with git submodules?
  28. Git: How to list commits on this branch but not from merged branches
  29. Git and working on multiple branches
  30. Commit a file to a Different Branch Without Checkout

Leave a Comment