From 6ef3c7d93edcf342c8be947b3b8f9d1cdcca9a8e Mon Sep 17 00:00:00 2001 From: Vicentiu Ciorbaru Date: Fri, 8 May 2015 17:09:45 +0300 Subject: Updated .gitattributes --- .gitattributes | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index cdfedef671f..2e238207619 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,24 @@ +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.c text +*.ic text +*.cc text +*.cpp text +*.h text +*.test text + +# These files should be checked out as is +*.result -text -whitespace +storage/connect/mysql-test/connect/std_data/*.txt -text +storage/connect/mysql-test/connect/std_data/*.dat -text + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary + *.c diff=cpp *.h diff=cpp *.cc diff=cpp -- cgit v1.2.1 From 23b2b95f8046aee8461c71926a049accbfcf0dd2 Mon Sep 17 00:00:00 2001 From: Vicentiu Ciorbaru Date: Fri, 8 May 2015 17:19:06 +0300 Subject: Update .gitattributes --- .gitattributes | 2 -- 1 file changed, 2 deletions(-) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 2e238207619..60b9a3481aa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,8 +12,6 @@ # These files should be checked out as is *.result -text -whitespace -storage/connect/mysql-test/connect/std_data/*.txt -text -storage/connect/mysql-test/connect/std_data/*.dat -text # Denote all files that are truly binary and should not be modified. *.png binary -- cgit v1.2.1 From 934a18daece8f503e60886d3e4c5d84307f453c7 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 3 Jun 2015 19:42:34 +0200 Subject: .gitattributes: *.dat files should not be CRLF converted --- .gitattributes | 1 + 1 file changed, 1 insertion(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 60b9a3481aa..0b51237e6d6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,6 +12,7 @@ # These files should be checked out as is *.result -text -whitespace +*.dat -text -whitespace # Denote all files that are truly binary and should not be modified. *.png binary -- cgit v1.2.1 From 08fa02cf227a632ed787357357d6116b72c6d5e6 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 4 Jun 2015 18:51:30 +0400 Subject: Some MYD files (e.g. in mysql-test/std_data) could erroneously be treated by git as text files. Marking all MyISAM files as binary in .gitattributes: (*.frm, *.MYD, *.MYI) --- .gitattributes | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index 60b9a3481aa..342dad5646b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,6 +16,9 @@ # Denote all files that are truly binary and should not be modified. *.png binary *.jpg binary +*.frm binary +*.MYD binary +*.MYI binary *.c diff=cpp *.h diff=cpp -- cgit v1.2.1 From 772c3f370267f40d97689942a84f5093a4d933d8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 28 Jul 2015 17:56:11 +0200 Subject: .gitattributes: pcre/testdata/greppatN4 -text --- .gitattributes | 1 + 1 file changed, 1 insertion(+) (limited to '.gitattributes') diff --git a/.gitattributes b/.gitattributes index b62a174c5e5..b2e324795aa 100644 --- a/.gitattributes +++ b/.gitattributes @@ -15,6 +15,7 @@ *.dat -text -whitespace storage/connect/mysql-test/connect/std_data/*.txt -text +pcre/testdata/greppatN4 -text # Denote all files that are truly binary and should not be modified. *.png binary -- cgit v1.2.1