Setting the text attribute in .gitattributes as I did for java files and some other well-known text files overrides the user Git configuration for the repository, and in particular makes sure that even if you checkout or transform the text files on Windows as LCRF when they are checked in they are internally stored as LF
Basically it fixes a wrongly configured
core.autocrlf
in the user settings, making sure that even if people like to use editors which output LCRF we won't have problems with it as the internal format will always be "proper way".
About the diff option:
*.java diff=java
that just changes how the header you see in diff output and patches is generated. It doesn't affect internal format, just the patch hunk header will contain the java function/method name instead of only the top level class. Default implementation looks for "C like" source, which is almost fine for Java but this one is a a little more practical for our case.
Final warning note, applying the text attribute forced reformat of the wrongly formatted files: so OgmTableGenerator had to be fixed on its line endings.
Setting the text attribute in .gitattributes as I did for java files and some other well-known text files overrides the user Git configuration for the repository, and in particular makes sure that even if you checkout or transform the text files on Windows as LCRF when they are checked in they are internally stored as LF
Basically it fixes a wrongly configured
in the user settings, making sure that even if people like to use editors which output LCRF we won't have problems with it as the internal format will always be "proper way".About the diff option:
that just changes how the header you see in diff output and patches is generated. It doesn't affect internal format, just the patch hunk header will contain the java function/method name instead of only the top level class. Default implementation looks for "C like" source, which is almost fine for Java but this one is a a little more practical for our case.
Final warning note, applying the text attribute forced reformat of the wrongly formatted files: so OgmTableGenerator had to be fixed on its line endings.