I've found tons of sites that explain how to have git warn you when you're changing line endings, or miscellaneous other techniques to prevent you from messing up an entire file. Assume it's too late for that -- the tree already has commits that toggle the line endings of files, so git diff
shows the subtraction of the old file followed by the addition of a new file with the same content
I'm looking for a git configuration option or command-line flag that tells diff
to just ignore those -- if two lines differ only by whitespace, pretend they're the same. I need this config option/flag to work for anything that relies on file differences -- diff
, blame
, even merge
/rebase
ideally -- I want git
to completely ignore trailing whitespace, particularly line endings. How can I do that?