Skip to content

Commit

Permalink
New policy: files are binary unless explicitly marked as text in .git…
Browse files Browse the repository at this point in the history
…attributes

Modified as per discussion of PR pioneerspacesim#2323.
  • Loading branch information
Pedro Gimeno authored and robn committed Jun 3, 2013
1 parent 472a715 commit c17b7b0
Showing 1 changed file with 71 additions and 1 deletion.
72 changes: 71 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,71 @@
text eol=lf
# Define our own attribute for text files

[attr]pitext text diff merge

# Global default

* binary

# Files without extension

README pitext
bootstrap pitext
changelog pitext
compat pitext
control pitext
copyright pitext
docs pitext
format pitext
generic-exec pitext
pioneer pitext
rules pitext
.gitignore pitext
.gitattributes pitext

# Normal text extensions

*.ac pitext
*.am pitext
*.c pitext
*.common pitext
*.cpp pitext
*.css pitext
*.DAE pitext
*.dae pitext
*.exclude pitext
*.frag pitext
*.glsl pitext
*.h pitext
*.hpp pitext
*.ini pitext
*.install pitext
*.lua pitext
*.m pitext
*.model pitext
*.mtl pitext
*.pbxproj pitext
*.pch pitext
*.pl pitext
*.plist pitext
*.py pitext
*.rc pitext
*.rtf pitext
*.sh pitext
*.strings pitext
*.svg pitext
*.txt pitext
*.vert pitext
*.xcworkspacedata pitext
*.xib pitext

# OBJ files can be Wavefront (text) or OMF (binary).

*.obj pitext text=auto

# VC files

*.props pitext -merge
*.sln pitext -merge
*.vcproj pitext -merge
*.vcxproj pitext -merge
*.vcxproj.filters pitext -merge

0 comments on commit c17b7b0

Please sign in to comment.