From: Francois-Xavier Le Bail Date: Wed, 18 Feb 2015 13:37:53 +0000 (+0100) Subject: gitattributes: cleanup unused patterns X-Git-Tag: tcpdump-4.7.2~1^2~23 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/f04e49cd8b2f48d980f34f0d54984fccefdf39c1 gitattributes: cleanup unused patterns --- diff --git a/.gitattributes b/.gitattributes index 6a390401..3c6697b7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,24 +3,3 @@ core.autocrlf=true # 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 -#unix/linux stuff (tarballs)