git diff - show me line ending changes?

git line-endings git-diff
Stonky picture Stonky · Oct 13, 2010 · Viewed 47.7k times · Source

My editor is changing the line endings of my source files. When I do git diff, I see the same line twice -- once with - and once with + -- with no visible difference.

How do I get git diff to show me what this change actually was?

Answer

Paul Whittaker picture Paul Whittaker · Jul 16, 2012

First, make sure you're using the coloured output (e.g. with git diff --color) and that you've enabled whitespace highlighting with (e.g.)

git config color.diff.whitespace "red reverse"

This might not work in all cases, however, as git doesn't appear to highlight trailing whitespace for removed lines. To see whitespace that you've deleted, simply use

git diff -R

to put the whitespace on the 'added' side of the comparison, where it does get highlighted.

For more detail, see the answers at this SO question.

Related questions

Why should I use core.autocrlf=true in Git?

I have a Git repository that is accessed from both Windows and OS X, and that I know already contains some files with CRLF line-endings. As far as I can tell, there are two ways to deal with this: Set …

Read More
Git status ignore line endings / identical files / windows & linux environment / dropbox / mled

How do I make git status ignore line ending differences? Background info: I use randomly Windows and Linux to work on the project. The project is in Dropbox. I found a lot about how do make git diff ignore line …

Read More
env: bash\r: No such file or directory

I'm trying to install YouCompleteMe from here. When I execute: ./install.sh --clang-completer I get this error: env: bash\r: No such file or directory I don't know what's wrong with environment variables. Here's my bash path: which bash /bin/…

Read More