Repository: incubator-reef Updated Branches: refs/heads/master ca5b964ef -> 0918a67fd
[REEF-579] All .NET files should be checked out as CRLF from git Address the problem by creating .gitattributes in /lang/cs and /lang/java. Also remove local .gitattributes from java Wake and Tang. JIRA: [REEF-579](https://issues.apache.org/jira/browse/REEF-579) Pull Request: This closes #358 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/0918a67f Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/0918a67f Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/0918a67f Branch: refs/heads/master Commit: 0918a67fda19fceed338515e080ea2aeb56184c2 Parents: ca5b964 Author: Brian Cho <[email protected]> Authored: Mon Aug 10 12:58:40 2015 +0900 Committer: Markus Weimer <[email protected]> Committed: Mon Aug 10 07:59:43 2015 -0700 ---------------------------------------------------------------------- .gitattributes | 16 ++++++++++++++-- lang/cs/.gitattributes | 9 +++++++++ lang/java/.gitattributes | 9 +++++++++ lang/java/reef-tang/.gitattributes | 3 --- lang/java/reef-wake/.gitattributes | 3 --- 5 files changed, 32 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0918a67f/.gitattributes ---------------------------------------------------------------------- diff --git a/.gitattributes b/.gitattributes index fa96ba0..fc96a93 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,7 @@ -# Commit text files using LF endings +# Note that settings for text files below are overridden +# within /lang/*/ directories by local .gitattributes + +# Files to checkout with LF *.java text eol=lf whitespace=trailing-space,space-before-tab,tab-in-indent,blank-at-eof *.sh text eol=lf *.js text eol=lf @@ -10,6 +13,8 @@ LICENSE text eol=lf NOTICE text eol=lf *.md text eol=lf pom.xml text eol=lf + +# Files to checkout with CRLF *.h text eol=crlf *.cpp text eol=crlf *.rc text eol=crlf @@ -19,7 +24,14 @@ pom.xml text eol=lf *.cs text eol=crlf *.cmd text eol=crlf *.ps1 text eol=crlf -*.psm1 eol=crlf +*.psm1 text eol=crlf + +# Binary files *.png binary *.jpg binary +*.snk binary +*.ico binary +*.bin binary + +# Commit text files using LF endings * text=auto http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0918a67f/lang/cs/.gitattributes ---------------------------------------------------------------------- diff --git a/lang/cs/.gitattributes b/lang/cs/.gitattributes new file mode 100644 index 0000000..bf96f35 --- /dev/null +++ b/lang/cs/.gitattributes @@ -0,0 +1,9 @@ +# Checkout all files with CRLF +* text eol=crlf + +# Except binary files +*.png binary +*.jpg binary +*.snk binary +*.ico binary +*.bin binary http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0918a67f/lang/java/.gitattributes ---------------------------------------------------------------------- diff --git a/lang/java/.gitattributes b/lang/java/.gitattributes new file mode 100644 index 0000000..bbdda29 --- /dev/null +++ b/lang/java/.gitattributes @@ -0,0 +1,9 @@ +# Checkout all files with LF +* text eol=lf + +# Except binary files +*.png binary +*.jpg binary +*.snk binary +*.ico binary +*.bin binary http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0918a67f/lang/java/reef-tang/.gitattributes ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/.gitattributes b/lang/java/reef-tang/.gitattributes deleted file mode 100644 index db5b15f..0000000 --- a/lang/java/reef-tang/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -# Commit text files using LF endings -*.java text eol=lf whitespace=trailing-space,space-before-tab,tab-in-indent,blank-at-eof -* text=auto http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/0918a67f/lang/java/reef-wake/.gitattributes ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/.gitattributes b/lang/java/reef-wake/.gitattributes deleted file mode 100644 index db5b15f..0000000 --- a/lang/java/reef-wake/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -# Commit text files using LF endings -*.java text eol=lf whitespace=trailing-space,space-before-tab,tab-in-indent,blank-at-eof -* text=auto
