diff --git a/.gitattributes b/.gitattributes index 49954d9048..08206ab9e1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,12 +6,16 @@ # preferred and mitigates potential problems with end of line (eol) character differences. # ----------------------------------------------------------------------------------------------------- -# Set the default end of line behavior (i.e. normalization to `lf` upon commit) for all files git recognizes as text -# Note that this *only* applies to newly commited files. If the file previously existed with a `crlf` end of file -# and was checked out to local, then git will not change the eol character during check in (i.e. commit). +## Set the default end of line behavior (i.e. normalization to `lf` upon commit) for all files git recognizes as text * text=auto -# Explicitly declare to git which files should be normalized (i.e. treated as text files) +# Note that the above *only* applies to newly commited files. If the file previously existed with a `crlf` end of file +# and was checked out to local, then git will not change the eol character during check-in (i.e. commit). For +# windows users they will see a warning like this: +# warning: CRLF will be replaced by LF in functional_unit_testing/allometry/drive_allomtests.py. +# The file will have its original line endings in your working directory + +## Explicitly declare to git which files should be normalized (i.e. treated as text files) *.cdl text *.F90 text *.F90_in text @@ -21,5 +25,5 @@ *.txt text *.xml text -# Declare to git which file types are binary files and should not have end of line modified +## Declare to git which file types are binary files and should not have end of line modified *.mod binary \ No newline at end of file