From faa932b73524b0c42a65c573bc4e01a0380f30c5 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Sat, 12 Oct 2013 06:50:15 -0400 Subject: [PATCH] Auto-Sync --- .gitattributes | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitattributes b/.gitattributes index 412eeda78..2af4f3129 100644 --- a/.gitattributes +++ b/.gitattributes @@ -20,3 +20,14 @@ *.PDF diff=astextplain *.rtf diff=astextplain *.RTF diff=astextplain + + These files are text and should be normalized (Convert crlf => lf) +*.java text +*.xml text +*.txt text + +# These files are binary and should be left untouched +# (binary is a macro for -text -diff) +*.jar binary +*.so binary +*.dll binary