added a comment - - edited
You can use git diff -w $(git merge-base HEAD master) to see the actual diff minus the line ending change. Here it is inline:
:: git diff -w $(git merge-base HEAD master)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
@@ -0,0 +1,6 @@
+*.java text diff=java
Also, no, it won't render all the outstanding patches incompatible. For one, it seems like the files that have the eols mixed or in CRLF aren't touched much. I also went through the majority of outstanding patches and couldn't fix one that conflicts. Secondly, format-patch emits the patch inline and is intended to be sent via email. SMTP says that all lines must end with CRLF, so line endings are effectively lost. So git will convert it to the right line ending on application.
It can conflict with any outstanding branches that you may have. Supplying the renormalization option on merge can help:
git merge -X renormalize <branch-name>
Or, you can enable this by default for your repository:
git config --local merge.renormalize true
If you think it's too much trouble, let's just drop it though.