Permalink
Browse files

Don't force line-ending normalization on users

Users can still get this by copying our /etc/gitattributes.suggested
file into their repository or creating their own .gitattributes file.
But now they won't have to wonder why a whole bunch of line endings are
marked as changed after cloning a repository that was created without
normalization.
  • Loading branch information...
1 parent 8e37122 commit b2691a2495f7e98aeaca649dfc359ecf1d70e130 @aroben aroben committed Jun 8, 2012
Showing with 23 additions and 4 deletions.
  1. +0 −3 etc/gitattributes
  2. +22 −0 etc/gitattributes.suggested
  3. +1 −1 share/WinGit/copy-files.sh
View
@@ -1,6 +1,3 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.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
@@ -90,7 +90,7 @@ cp $MSYSGITROOT/etc/bash_profile etc/ &&
cp $MSYSGITROOT/etc/termcap etc/ &&
cp $MSYSGITROOT/etc/inputrc etc/ &&
sed 's/ = \/mingw\// = \//' < $MSYSGITROOT/etc/gitconfig > etc/gitconfig &&
-cp $MSYSGITROOT/etc/gitattributes etc/ &&
+cp $MSYSGITROOT/etc/gitattributes{,.suggested} etc/ &&
cp $MSYSGITROOT/etc/gitignore.suggested etc/ &&
mkdir etc/ssh &&
cp $MSYSGITROOT/etc/ssh/ssh_config etc/ssh &&

0 comments on commit b2691a2

Please sign in to comment.