[47/47] git commit: ISIS-188: adding a standard .gitattributes file

[da...@apache.org]

ISIS-188: adding a standard .gitattributes file


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/cfec8107
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/cfec8107
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/cfec8107

Branch: refs/heads/master
Commit: cfec8107485d3dec71fa38d7a6ea278ad145012d
Parents: fdb5947
Author: Dan Haywood <da...@apache.org>
Authored: Tue Dec 4 21:52:00 2012 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Tue Dec 4 21:52:00 2012 +0000

----------------------------------------------------------------------
 .gitattributes |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/cfec8107/.gitattributes
----------------------------------------------------------------------
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..b1eafb6
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,51 @@
+#
+#
+# text files are normalized (convert crlf => lf)
+# binary files are not normalized (binary is a macro for -text -diff)
+#
+#
+
+
+# Unless otherwise stated, assume text
+
+* text=auto
+
+
+*.java text diff=java
+*.html text diff=html
+*.xhtml text diff=html
+*.xml text
+*.txt text
+
+
+*.jar binary
+*.so binary
+*.dll binary
+
+# images
+*.jpg binary
+*.jpeg binary
+*.png binary
+*.pdn binary
+*.pdn binary
+
+
+*.cs     text diff=csharp
+
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
+