zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mic...@apache.org
Subject svn commit: r1584501 - in /zookeeper/trunk: .gitattributes CHANGES.txt
Date Fri, 04 Apr 2014 01:33:46 GMT
Author: michim
Date: Fri Apr  4 01:33:45 2014
New Revision: 1584501

URL: http://svn.apache.org/r1584501
Log:
ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for source and text
files (Raja Aluri via michim)

Added:
    zookeeper/trunk/.gitattributes
Modified:
    zookeeper/trunk/CHANGES.txt

Added: zookeeper/trunk/.gitattributes
URL: http://svn.apache.org/viewvc/zookeeper/trunk/.gitattributes?rev=1584501&view=auto
==============================================================================
--- zookeeper/trunk/.gitattributes (added)
+++ zookeeper/trunk/.gitattributes Fri Apr  4 01:33:45 2014
@@ -0,0 +1,19 @@
+# Auto detect text files and perform LF normalization
+*        text=auto
+
+*.cs     text diff=csharp
+*.java   text diff=java
+*.html   text diff=html
+*.py     text diff=python
+*.pl     text diff=perl
+*.pm     text diff=perl
+*.css    text
+*.js     text
+*.sql    text
+
+*.sh     text eol=lf
+
+*.bat    text eol=crlf
+*.cmd    text eol=crlf
+*.csproj text merge=union eol=crlf
+*.sln    text merge=union eol=crlf

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1584501&r1=1584500&r2=1584501&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Fri Apr  4 01:33:45 2014
@@ -847,6 +847,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1831. Document remove watches details to the guide (Rakesh R via
   michim)
 
+  ZOOKEEPER-1575. adding .gitattributes to prevent CRLF and LF mismatches for
+  source and text files (Raja Aluri via michim)
+
 headers
 
 Release 3.4.0 - 



Mime
View raw message