summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne Wuff <torne@wolfpuppy.org.uk>2011-12-01 14:14:59 +0000
committerTorne Wuff <torne@wolfpuppy.org.uk>2011-12-01 14:14:59 +0000
commit8b9d6bdd1fe76228309102091cea56eaedf45a90 (patch)
treed6f150e23949719c39df63d7d9b233d2f450b566
parent30e2a6d58d2fc6d160e35e9f31a80f646b07b17c (diff)
Add a gitattributes file for the migration.
When we start using git, we will be doing automatic line ending conversion in a nice uniform way: everything is expected to have LFs, rather than the current odd patchwork of svn:eol-style attributes. This .gitattributes file configures git to normalise all line endings to LF on checkin in files it believes are text (and its heuristics appear to be very good). It also explicitly declares a number of file types to be binary (which both disables line ending conversion for them and also prevents git attempting to display a textual diff of them). I have already normalised all files in the repository now to have the correct line endings, so this should not do anything bad for anyone who is already using git. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31104 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--.gitattributes16
1 files changed, 16 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..f8dee70145
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,16 @@
+* text=auto
+*.bmp binary
+*.cat -text
+*.dll binary
+*.fnt binary
+*.icns binary
+*.ico binary
+*.inf -text
+*.jpg binary
+*.pdf binary
+*.png binary
+*.svg binary
+*.sys binary
+*.vcproj -text
+*.wav binary
+*.xcf binary