You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2020/02/06 22:28:36 UTC

[uima-uimaj] 01/01: [UIMA-6187] add eol=lf for .sh files

This is an automated email from the ASF dual-hosted git repository.

schor pushed a commit to branch UIMA-6187-v2
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git

commit 941a8ceda1d390e345be457d98d27fe046586f75
Author: Marshall Schor <ms...@schor.com>
AuthorDate: Thu Feb 6 17:26:42 2020 -0500

    [UIMA-6187] add eol=lf for .sh files
---
 .gitattributes | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 8f18cfb..e708bb1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,20 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
+#   means that files that GIT determines to be text files, will be 
+#     converted from CRLF -> LF upon being added to the repo, and
+#     converted from LF -> LF or CRLF when checked out (depending on the platform, I think)
 * text=auto
 
 # Make sure that these files are treated as binary so that newlines are preserved.
+#   overrides GIT's determination if a file is text or not
 *.bin binary
 *.dump binary
 *.xcas binary
 *.xmi binary
+#  next is probably the default
+*.pdf binary
+
+# These files cannot have crlf, must have just lf
+# The "text" by itself says these files must be line-ending-conversion controlled on check-in / out
+#   The internal repo form for these is always lf, 
+#   The eol=lf means on check-out do nothing, and on check-in, if the file has crlf, convert to lf
+*.sh text eol=lf