Skip to content

Commit 246c75c

Browse files
Your NameJim Northrup
Your Name
authored and
Jim Northrup
committed
this will reduce whitespace churn
(cherry picked from commit 46d6213)
1 parent 8bb62f4 commit 246c75c

File tree

1 file changed

+53
-0
lines changed

1 file changed

+53
-0
lines changed

.gitattributes

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# https://gist.githubusercontent.com/dpalomar/ebc64d6f56cfc25a3e5c20fe7cdfbd4f/raw/87ccba61ccd0758cf9e4ddade082977eb0d0985b/.gitattributes
2+
#From this [issue](https://github.com/puphpet/puphpet/issues/1025#issuecomment-157059174):
3+
#
4+
#
5+
#I know that this issue is closed, but as I spent a lot of time to understand what was going on, I made some researches and I can explain why this happen, and you can fix it.
6+
#
7+
#Using git config core.autocrlf true can help, but not on a multi-developpers project.
8+
#This command has to be the same on each developper machine, and that's not always the case.
9+
#
10+
#You have to use the .gitattributes provided in the puphpet archive and edit it as follow (carefull, this file need to be in your project root)
11+
#You also need to use an IDE that allow you to save/edit files as LF (like phpstorm). You can check the type of the file in the bottom right corner, in the status bar (you'll see LF or CRLF while a file is opened)
12+
#
13+
#.gitattributes
14+
#=================================================
15+
# These settings are for any web project
16+
17+
# Handle line endings automatically for files detected as text
18+
# and leave all files detected as binary untouched.
19+
* text=auto
20+
21+
# Force the following filetypes to have unix eols, so Windows does not break them
22+
*.* text eol=lf
23+
24+
# Windows forced line-endings
25+
/.idea/* text eol=crlf
26+
27+
#
28+
## These files are binary and should be left untouched
29+
#
30+
31+
# (binary is a macro for -text -diff)
32+
*.png binary
33+
*.jpg binary
34+
*.jpeg binary
35+
*.gif binary
36+
*.ico binary
37+
*.mov binary
38+
*.mp4 binary
39+
*.mp3 binary
40+
*.flv binary
41+
*.fla binary
42+
*.swf binary
43+
*.gz binary
44+
*.zip binary
45+
*.7z binary
46+
*.ttf binary
47+
*.eot binary
48+
*.woff binary
49+
*.pyc binary
50+
*.pdf binary
51+
*.ez binary
52+
*.bz2 binary
53+
*.swp binary

0 commit comments

Comments
 (0)