Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2016-02-02 12:06:04 +0000
committerBenoit Maggi2016-02-08 08:44:28 +0000
commit42c80a5c823fda32ad4a2f7dd2178297870adbad (patch)
tree08497653a982e27e185c15311661f30bc172c490
parent7fe74e06f11ad04a801d65be9c1199ed1b8eb3d3 (diff)
downloadorg.eclipse.papyrus-42c80a5c823fda32ad4a2f7dd2178297870adbad.tar.gz
org.eclipse.papyrus-42c80a5c823fda32ad4a2f7dd2178297870adbad.tar.xz
org.eclipse.papyrus-42c80a5c823fda32ad4a2f7dd2178297870adbad.zip
Bug 486996 - Add .gitattributes to avoid EOL conflict
- add all know file extension in the papyrus project Change-Id: I4272d24b5445f3d6a733c5f34473dc3cba9a3750 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
-rwxr-xr-x.gitattributes82
1 files changed, 82 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100755
index 00000000000..16c79c5720c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,82 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+*.assistants text
+*.classpath text
+*.configuration text
+*.creationmenumodel text
+*.css text
+*.csv text
+*.ctx text
+*.df text
+*.di text
+*.ecore text
+*.efx text
+*.elementtypesconfigurations text
+*.emx text
+*.epx text
+*.expansionmodel text
+*.exsd text
+*.extendedtypes text
+*.fml text
+*.genmodel text
+*.gmfgen text
+*.htm text
+*.html text
+*.idgen text
+*.ini text
+*.java text
+*.js text
+*.json text
+*.jsp text
+*.jspf text
+*.LICENSE text
+*.md text
+*.mediawiki text
+*.MF text
+*.mwe2 text
+*.nattableconfiguration text
+*.notation text
+*.paletteconfiguration text
+*.prefs text
+*.product text
+*.project text
+*.properties text
+*.py text
+*.sh text
+*.suite text
+*.svg text
+*.test text
+*.tld text
+*.tsv text
+*.txt text
+*.uml text
+*.xmi text
+*.xml text
+*.xsd text
+*.xtext text
+*.xwt text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.bmp binary
+*.class binary
+*.dll binary
+*.dylib binary
+*.ear binary
+*.gif binary
+*.ico binary
+*.icns binary
+*.jar binary
+*.jpg binary
+*.jpeg binary
+*.pdf binary
+*.png binary
+*.so binary
+*.war binary
+*.zip binary

Back to the top