From 00b05b0989a2612e950536feb3f19b25f58018ef Mon Sep 17 00:00:00 2001
From: cgdecker <cgdecker@google.com>
Date: Tue, 4 Nov 2014 12:40:22 -0800
Subject: [PATCH] Add a .gitattributes file to control line ending
 normalization, which is otherwise a mess that depends on each git client's
 settings. (See http://schacon.github.io/git/gitattributes.html and
 http://adaptivepatchwork.com/2012/03/01/mind-the-end-of-your-line/ for more
 about that.) ------------- Created by MOE: http://code.google.com/p/moe-java
 MOE_MIGRATED_REVID=79186519

---
 .gitattributes | 14 ++++++++++++++
 .gitignore     |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..1e3b76511d02
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,14 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Known text files
+*.java text
+*.xml text
+*.yml text
+*.md text
+*.sh text
+*.css text
+*.txt text
+
+# Known binary files
+*.jar binary
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4265c9b3716c..ea9f52f16e89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,4 @@ out/
 .classpath
 .project
 .settings/
-.metadata/
+.metadata/
\ No newline at end of file