mirror of
https://github.com/gitattributes/gitattributes.git
synced 2025-01-22 00:08:52 -05:00
Format gitattributes files
This commit is contained in:
parent
98c843fb2b
commit
3bbc79c5e7
13
.gitattributes
vendored
13
.gitattributes
vendored
@ -1,12 +1,19 @@
|
|||||||
# THIS IS ONLY FOR THE gitattributes REPOSITORY.
|
# THIS IS ONLY FOR THE gitattributes REPOSITORY.
|
||||||
# Handle line endings automatically for files detected as text
|
# Handle line endings automatically for files detected as text
|
||||||
# and leave all files detected as binary untouched.
|
# and leave all files detected as binary untouched.
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
#
|
#
|
||||||
# The above will handle all files NOT found below
|
# The above will handle all files NOT found below
|
||||||
#
|
#
|
||||||
# These files are text and should be normalized (Convert crlf => lf)
|
# These files are text and should be normalized (Convert crlf => lf)
|
||||||
*.gitattributes text
|
*.gitattributes text
|
||||||
.gitignore text
|
.gitignore text
|
||||||
*.md text
|
*.md text
|
||||||
|
|
||||||
|
#
|
||||||
|
# Exclude files from exporting
|
||||||
|
#
|
||||||
|
|
||||||
|
.gitattributes export-ignore
|
||||||
|
.gitignore export-ignore
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Handle line endings automatically for files detected as text
|
# Handle line endings automatically for files detected as text
|
||||||
# and leave all files detected as binary untouched.
|
# and leave all files detected as binary untouched.
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
# Ada files
|
# Ada files
|
||||||
*.ada text diff=ada
|
*.ada text diff=ada
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Handle line endings automatically for files detected as text
|
# Handle line endings automatically for files detected as text
|
||||||
# and leave all files detected as binary untouched.
|
# and leave all files detected as binary untouched.
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
#
|
#
|
||||||
# The above will handle all files NOT found below
|
# The above will handle all files NOT found below
|
||||||
|
@ -1,36 +1,36 @@
|
|||||||
# Sources
|
# Sources
|
||||||
*.c text diff=c
|
*.c text diff=c
|
||||||
*.cc text diff=cpp
|
*.cc text diff=cpp
|
||||||
*.cxx text diff=cpp
|
*.cxx text diff=cpp
|
||||||
*.cpp text diff=cpp
|
*.cpp text diff=cpp
|
||||||
*.c++ text diff=cpp
|
*.c++ text diff=cpp
|
||||||
*.hpp text diff=cpp
|
*.hpp text diff=cpp
|
||||||
*.h text diff=c
|
*.h text diff=c
|
||||||
*.h++ text diff=cpp
|
*.h++ text diff=cpp
|
||||||
*.hh text diff=cpp
|
*.hh text diff=cpp
|
||||||
|
|
||||||
# Compiled Object files
|
# Compiled Object files
|
||||||
*.slo binary
|
*.slo binary
|
||||||
*.lo binary
|
*.lo binary
|
||||||
*.o binary
|
*.o binary
|
||||||
*.obj binary
|
*.obj binary
|
||||||
|
|
||||||
# Precompiled Headers
|
# Precompiled Headers
|
||||||
*.gch binary
|
*.gch binary
|
||||||
*.pch binary
|
*.pch binary
|
||||||
|
|
||||||
# Compiled Dynamic libraries
|
# Compiled Dynamic libraries
|
||||||
*.so binary
|
*.so binary
|
||||||
*.dylib binary
|
*.dylib binary
|
||||||
*.dll binary
|
*.dll binary
|
||||||
|
|
||||||
# Compiled Static libraries
|
# Compiled Static libraries
|
||||||
*.lai binary
|
*.lai binary
|
||||||
*.la binary
|
*.la binary
|
||||||
*.a binary
|
*.a binary
|
||||||
*.lib binary
|
*.lib binary
|
||||||
|
|
||||||
# Executables
|
# Executables
|
||||||
*.exe binary
|
*.exe binary
|
||||||
*.out binary
|
*.out binary
|
||||||
*.app binary
|
*.app binary
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Auto detect text files and perform LF normalization
|
# Auto detect text files and perform LF normalization
|
||||||
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
|
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
*.cs text diff=csharp
|
*.cs text diff=csharp
|
||||||
|
@ -2,53 +2,53 @@
|
|||||||
|
|
||||||
# Auto detect text files and perform LF normalization
|
# Auto detect text files and perform LF normalization
|
||||||
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
|
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
#
|
#
|
||||||
# The above will handle all files NOT found below
|
# The above will handle all files NOT found below
|
||||||
#
|
#
|
||||||
|
|
||||||
# Documents
|
# Documents
|
||||||
*.bibtex text diff=bibtex
|
*.bibtex text diff=bibtex
|
||||||
*.doc diff=astextplain
|
*.doc diff=astextplain
|
||||||
*.DOC diff=astextplain
|
*.DOC diff=astextplain
|
||||||
*.docx diff=astextplain
|
*.docx diff=astextplain
|
||||||
*.DOCX diff=astextplain
|
*.DOCX diff=astextplain
|
||||||
*.dot diff=astextplain
|
*.dot diff=astextplain
|
||||||
*.DOT diff=astextplain
|
*.DOT diff=astextplain
|
||||||
*.pdf diff=astextplain
|
*.pdf diff=astextplain
|
||||||
*.PDF diff=astextplain
|
*.PDF diff=astextplain
|
||||||
*.rtf diff=astextplain
|
*.rtf diff=astextplain
|
||||||
*.RTF diff=astextplain
|
*.RTF diff=astextplain
|
||||||
*.md text
|
*.md text
|
||||||
*.tex text diff=tex
|
*.tex text diff=tex
|
||||||
*.adoc text
|
*.adoc text
|
||||||
*.textile text
|
*.textile text
|
||||||
*.mustache text
|
*.mustache text
|
||||||
*.csv text
|
*.csv text
|
||||||
*.tab text
|
*.tab text
|
||||||
*.tsv text
|
*.tsv text
|
||||||
*.sql text
|
*.sql text
|
||||||
|
|
||||||
# Graphics
|
# Graphics
|
||||||
*.png binary
|
*.png binary
|
||||||
*.jpg binary
|
*.jpg binary
|
||||||
*.jpeg binary
|
*.jpeg binary
|
||||||
*.gif binary
|
*.gif binary
|
||||||
*.tif binary
|
*.tif binary
|
||||||
*.tiff binary
|
*.tiff binary
|
||||||
*.ico binary
|
*.ico binary
|
||||||
# SVG treated as an asset (binary) by default.
|
# SVG treated as an asset (binary) by default.
|
||||||
*.svg text
|
*.svg text
|
||||||
# If you want to treat it as text,
|
# If you want to treat it as text,
|
||||||
# use the following line instead.
|
# use the following line instead.
|
||||||
# *.svg binary
|
# *.svg binary
|
||||||
|
|
||||||
*.eps binary
|
*.eps binary
|
||||||
|
|
||||||
#
|
#
|
||||||
# Exclude files from exporting
|
# Exclude files from exporting
|
||||||
#
|
#
|
||||||
|
|
||||||
.gitattributes export-ignore
|
.gitattributes export-ignore
|
||||||
.gitignore export-ignore
|
.gitignore export-ignore
|
||||||
|
@ -3,93 +3,93 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Delphi form module
|
# Delphi form module
|
||||||
*.dfm text
|
*.dfm text
|
||||||
|
|
||||||
# Delphi project options file
|
# Delphi project options file
|
||||||
*.dof text
|
*.dof text
|
||||||
|
|
||||||
# Desktop configuration
|
# Desktop configuration
|
||||||
*.dsk binary
|
*.dsk binary
|
||||||
|
|
||||||
#
|
#
|
||||||
# General
|
# General
|
||||||
#
|
#
|
||||||
|
|
||||||
# Text file
|
# Text file
|
||||||
*.txt text
|
*.txt text
|
||||||
|
|
||||||
# Gettext Portable Object
|
# Gettext Portable Object
|
||||||
*.po binary
|
*.po binary
|
||||||
|
|
||||||
# Backup
|
# Backup
|
||||||
*.bak binary
|
*.bak binary
|
||||||
|
|
||||||
# Config file
|
# Config file
|
||||||
*.cfg text
|
*.cfg text
|
||||||
|
|
||||||
# Compiled Help File - contains html. See also package chm
|
# Compiled Help File - contains html. See also package chm
|
||||||
*.chm binary
|
*.chm binary
|
||||||
|
|
||||||
# Comma Separated Values text file format
|
# Comma Separated Values text file format
|
||||||
*.csv text
|
*.csv text
|
||||||
|
|
||||||
# Directly executable program
|
# Directly executable program
|
||||||
*.exe binary
|
*.exe binary
|
||||||
|
|
||||||
# Help file
|
# Help file
|
||||||
*.hlp binary
|
*.hlp binary
|
||||||
|
|
||||||
# Initialization file
|
# Initialization file
|
||||||
*.ini text
|
*.ini text
|
||||||
|
|
||||||
# OpenDocument text document
|
# OpenDocument text document
|
||||||
*.odt text
|
*.odt text
|
||||||
|
|
||||||
# Portable Document Format
|
# Portable Document Format
|
||||||
*.pdf text
|
*.pdf text
|
||||||
|
|
||||||
# PostScript
|
# PostScript
|
||||||
*.ps text
|
*.ps text
|
||||||
|
|
||||||
# Rich Text Format text file
|
# Rich Text Format text file
|
||||||
*.rtf text
|
*.rtf text
|
||||||
|
|
||||||
#
|
#
|
||||||
# Image
|
# Image
|
||||||
#
|
#
|
||||||
|
|
||||||
# Portable network graphic
|
# Portable network graphic
|
||||||
*.png binary
|
*.png binary
|
||||||
|
|
||||||
# Bitmap
|
# Bitmap
|
||||||
*.bmp binary
|
*.bmp binary
|
||||||
|
|
||||||
# Icon
|
# Icon
|
||||||
*.ico binary
|
*.ico binary
|
||||||
|
|
||||||
# Pixmap
|
# Pixmap
|
||||||
*.xpm binary
|
*.xpm binary
|
||||||
|
|
||||||
# Portable pixmap
|
# Portable pixmap
|
||||||
*.ppm binary
|
*.ppm binary
|
||||||
|
|
||||||
# Portable graymap
|
# Portable graymap
|
||||||
*.pgm binary
|
*.pgm binary
|
||||||
|
|
||||||
# Portable bitmap
|
# Portable bitmap
|
||||||
*.pbm binary
|
*.pbm binary
|
||||||
|
|
||||||
# Lossy graphics file
|
# Lossy graphics file
|
||||||
*.jpg binary
|
*.jpg binary
|
||||||
|
|
||||||
#
|
#
|
||||||
# XML
|
# XML
|
||||||
#
|
#
|
||||||
|
|
||||||
*.xml text
|
*.xml text
|
||||||
*.dtd text
|
*.dtd text
|
||||||
*.xsd text
|
*.xsd text
|
||||||
*.xsl text
|
*.xsl text
|
||||||
|
|
||||||
#
|
#
|
||||||
# Web
|
# Web
|
||||||
@ -99,37 +99,37 @@
|
|||||||
*.html text diff=html
|
*.html text diff=html
|
||||||
|
|
||||||
# Cascading style sheet
|
# Cascading style sheet
|
||||||
*.css text diff=css
|
*.css text diff=css
|
||||||
|
|
||||||
#
|
#
|
||||||
# Archive
|
# Archive
|
||||||
#
|
#
|
||||||
|
|
||||||
# tape archive
|
# tape archive
|
||||||
*.tar binary
|
*.tar binary
|
||||||
|
|
||||||
# archive file
|
# archive file
|
||||||
*.zip binary
|
*.zip binary
|
||||||
|
|
||||||
#
|
#
|
||||||
# Database
|
# Database
|
||||||
#
|
#
|
||||||
|
|
||||||
# Database file
|
# Database file
|
||||||
*.dbf binary
|
*.dbf binary
|
||||||
|
|
||||||
# Multiple index file
|
# Multiple index file
|
||||||
*.mdx binary
|
*.mdx binary
|
||||||
|
|
||||||
#
|
#
|
||||||
# Spreadsheet
|
# Spreadsheet
|
||||||
#
|
#
|
||||||
|
|
||||||
# OpenOffice.org Calc spreadsheet File Format
|
# OpenOffice.org Calc spreadsheet File Format
|
||||||
*.ods binary
|
*.ods binary
|
||||||
|
|
||||||
# Microsoft Excel File Format
|
# Microsoft Excel File Format
|
||||||
*.xls binary
|
*.xls binary
|
||||||
|
|
||||||
# Microsoft Office Open XML Excel File Format
|
# Microsoft Office Open XML Excel File Format
|
||||||
*.xlsx binary
|
*.xlsx binary
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
# - Fix automatically with `git apply --whitespace=fix`.
|
# - Fix automatically with `git apply --whitespace=fix`.
|
||||||
|
|
||||||
# Auto-detect text files, ensure they use LF.
|
# Auto-detect text files, ensure they use LF.
|
||||||
* text=auto eol=lf
|
* text=auto eol=lf
|
||||||
|
|
||||||
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=css
|
*.css text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=css
|
||||||
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
*.engine text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
# Handle line endings automatically for files detected as text
|
# Handle line endings automatically for files detected as text
|
||||||
# and leave all files detected as binary untouched.
|
# and leave all files detected as binary untouched.
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
# Fortran files
|
# Fortran files
|
||||||
*.f text diff=fortran
|
*.f text diff=fortran
|
||||||
*.f90 text diff=fortran
|
*.f90 text diff=fortran
|
||||||
*.f95 text diff=fortran
|
*.f95 text diff=fortran
|
||||||
*.f03 text diff=fortran
|
*.f03 text diff=fortran
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
# Handle line endings automatically for files detected as text
|
# Handle line endings automatically for files detected as text
|
||||||
# and leave all files detected as binary untouched.
|
# and leave all files detected as binary untouched.
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
# Fountain files
|
# Fountain files
|
||||||
*.fountain text diff=fountain
|
*.fountain text diff=fountain
|
||||||
*.pdf binary
|
*.pdf binary
|
||||||
*.fdx text
|
*.fdx text
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Handle line endings automatically for files detected as text
|
# Handle line endings automatically for files detected as text
|
||||||
# and leave all files detected as binary untouched.
|
# and leave all files detected as binary untouched.
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
#
|
#
|
||||||
# The above will handle all files NOT found below
|
# The above will handle all files NOT found below
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
# compare .pbxproj files as binary and always merge as union
|
# compare .pbxproj files as binary and always merge as union
|
||||||
*.pbxproj binary -merge=union
|
*.pbxproj binary -merge=union
|
||||||
*.m text diff=objc
|
*.m text diff=objc
|
||||||
|
@ -1,62 +1,62 @@
|
|||||||
# Lazarus Project Information file (stored in XML; contains project-specific settings)
|
# Lazarus Project Information file (stored in XML; contains project-specific settings)
|
||||||
*.lpi text
|
*.lpi text
|
||||||
|
|
||||||
# Lazarus Program file; contains Pascal source of main program
|
# Lazarus Program file; contains Pascal source of main program
|
||||||
*.lpr text
|
*.lpr text
|
||||||
|
|
||||||
# Lazarus Form file; contains configuration information for all objects on a form
|
# Lazarus Form file; contains configuration information for all objects on a form
|
||||||
# (stored in a Lazarus-specific format; the actions are described by Pascal source code in a corresponding *.pas file)
|
# (stored in a Lazarus-specific format; the actions are described by Pascal source code in a corresponding *.pas file)
|
||||||
*.lfm text
|
*.lfm text
|
||||||
|
|
||||||
# Unit with Pascal code (typically for a form stored in a corresponding *.lfm file)
|
# Unit with Pascal code (typically for a form stored in a corresponding *.lfm file)
|
||||||
*.pas text diff=pascal
|
*.pas text diff=pascal
|
||||||
|
|
||||||
# Pascal code
|
# Pascal code
|
||||||
*.pp text diff=pascal
|
*.pp text diff=pascal
|
||||||
|
|
||||||
# Lazarus Resource file (this is a generated file; not to be confused with a Windows resource file).
|
# Lazarus Resource file (this is a generated file; not to be confused with a Windows resource file).
|
||||||
*.lrs text
|
*.lrs text
|
||||||
|
|
||||||
# Compiled unit, symbols part.
|
# Compiled unit, symbols part.
|
||||||
*.ppu binary
|
*.ppu binary
|
||||||
|
|
||||||
# (1) Compiled unit, code part.
|
# (1) Compiled unit, code part.
|
||||||
# (2) Compiled code from other compilers (e.g. gcc)
|
# (2) Compiled code from other compilers (e.g. gcc)
|
||||||
*.o binary
|
*.o binary
|
||||||
|
|
||||||
# Object resource, automatically generated from {$R} directive.
|
# Object resource, automatically generated from {$R} directive.
|
||||||
*.or text
|
*.or text
|
||||||
|
|
||||||
# (1) Compiled unit, code part for smartlinking (on some platforms)
|
# (1) Compiled unit, code part for smartlinking (on some platforms)
|
||||||
# (2) Compiled code from other compilers (e.g. gcc) linked into a static library
|
# (2) Compiled code from other compilers (e.g. gcc) linked into a static library
|
||||||
*.a binary
|
*.a binary
|
||||||
|
|
||||||
# Lazarus package information file. (stored in XML; contains package-specific settings)
|
# Lazarus package information file. (stored in XML; contains package-specific settings)
|
||||||
*.lpk text
|
*.lpk text
|
||||||
|
|
||||||
# Include file
|
# Include file
|
||||||
*.inc text
|
*.inc text
|
||||||
|
|
||||||
# Lazarus Project Session file. See Project Options -> Save session information in
|
# Lazarus Project Session file. See Project Options -> Save session information in
|
||||||
*.lps text
|
*.lps text
|
||||||
|
|
||||||
# Lazarus Resourcestring table created when saving a lfm file and i18n is enabled. It contains the TTranslateString properties of the lfm.
|
# Lazarus Resourcestring table created when saving a lfm file and i18n is enabled. It contains the TTranslateString properties of the lfm.
|
||||||
*.lrt text
|
*.lrt text
|
||||||
|
|
||||||
# Resourcestring table created by the compiler for every unit with a resourcestring section.
|
# Resourcestring table created by the compiler for every unit with a resourcestring section.
|
||||||
*.rst text
|
*.rst text
|
||||||
|
|
||||||
# Resourcestring table in JSON format created by FPC 2.7.1 for units with resourcestring section.
|
# Resourcestring table in JSON format created by FPC 2.7.1 for units with resourcestring section.
|
||||||
*.rsj text
|
*.rsj text
|
||||||
|
|
||||||
# Compilation session for a project
|
# Compilation session for a project
|
||||||
*.compiled text
|
*.compiled text
|
||||||
|
|
||||||
# Resource file
|
# Resource file
|
||||||
*.res text
|
*.res text
|
||||||
|
|
||||||
# Lazarus resource form file
|
# Lazarus resource form file
|
||||||
*.rc text
|
*.rc text
|
||||||
|
|
||||||
# Icon file
|
# Icon file
|
||||||
*.ico binary
|
*.ico binary
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
|
|
||||||
# Source files
|
# Source files
|
||||||
# ============
|
# ============
|
||||||
*.pl text diff=perl
|
*.pl text diff=perl
|
||||||
*.pm text diff=perl
|
*.pm text diff=perl
|
||||||
|
@ -2,20 +2,20 @@
|
|||||||
|
|
||||||
# Source files
|
# Source files
|
||||||
# ============
|
# ============
|
||||||
*.pxd text diff=python
|
*.pxd text diff=python
|
||||||
*.py text diff=python
|
*.py text diff=python
|
||||||
*.py3 text diff=python
|
*.py3 text diff=python
|
||||||
*.pyw text diff=python
|
*.pyw text diff=python
|
||||||
*.pyx text diff=python
|
*.pyx text diff=python
|
||||||
|
|
||||||
# Binary files
|
# Binary files
|
||||||
# ============
|
# ============
|
||||||
*.db binary
|
*.db binary
|
||||||
*.p binary
|
*.p binary
|
||||||
*.pkl binary
|
*.pkl binary
|
||||||
*.pyc binary
|
*.pyc binary
|
||||||
*.pyd binary
|
*.pyd binary
|
||||||
*.pyo binary
|
*.pyo binary
|
||||||
|
|
||||||
# Note: .db, .p, and .pkl files are associated
|
# Note: .db, .p, and .pkl files are associated
|
||||||
# with the python modules ``pickle``, ``dbm.*``,
|
# with the python modules ``pickle``, ``dbm.*``,
|
||||||
|
@ -2,11 +2,10 @@
|
|||||||
|
|
||||||
# Source files
|
# Source files
|
||||||
# ============
|
# ============
|
||||||
*.Rdata text
|
*.Rdata text
|
||||||
*.rdb binary
|
*.rdb binary
|
||||||
*.rds binary
|
*.rds binary
|
||||||
*.Rd text
|
*.Rd text
|
||||||
*.Rdx binary
|
*.Rdx binary
|
||||||
*.Rmd text
|
*.Rmd text
|
||||||
*.R text
|
*.R text
|
||||||
|
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
* text=auto
|
# Auto detect text files and perform LF normalization
|
||||||
|
# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
|
||||||
|
* text=auto
|
||||||
|
|
||||||
*.frm -text
|
*.frm -text
|
||||||
*.val -text
|
*.val -text
|
||||||
@ -7,5 +9,5 @@
|
|||||||
*.obj -text
|
*.obj -text
|
||||||
*.dbi -text
|
*.dbi -text
|
||||||
*.sec -text
|
*.sec -text
|
||||||
*.css -text diff=css
|
*.css text diff=css
|
||||||
*.js eol=lf
|
*.js seol=lf
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
###############################################################################
|
###############################################################################
|
||||||
# Set default behavior to automatically normalize line endings.
|
# Set default behavior to automatically normalize line endings.
|
||||||
###############################################################################
|
###############################################################################
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Set the merge driver for project and solution files
|
# Set the merge driver for project and solution files
|
||||||
#
|
#
|
||||||
# Merging from the command prompt will add diff markers to the files if there
|
# Merging from the command prompt will add diff markers to the files if there
|
||||||
# are conflicts (Merging from VS is not affected by the settings below, in VS
|
# are conflicts (Merging from VS is not affected by the settings below, in VS
|
||||||
# the diff markers are never inserted). Diff markers may cause the following
|
# the diff markers are never inserted). Diff markers may cause the following
|
||||||
# file extensions to fail to load in VS. An alternative would be to treat
|
# file extensions to fail to load in VS. An alternative would be to treat
|
||||||
# these files as binary and thus will always conflict and require user
|
# these files as binary and thus will always conflict and require user
|
||||||
# intervention with every merge. To do so, just comment the entries below and
|
# intervention with every merge. To do so, just comment the entries below and
|
||||||
|
@ -9,192 +9,192 @@
|
|||||||
# Note that binary is a macro for -text -diff.
|
# Note that binary is a macro for -text -diff.
|
||||||
######################################################################
|
######################################################################
|
||||||
|
|
||||||
## AUTO-DETECT
|
# Auto detect
|
||||||
## Handle line endings automatically for files detected as
|
## Handle line endings automatically for files detected as
|
||||||
## text and leave all files detected as binary untouched.
|
## text and leave all files detected as binary untouched.
|
||||||
## This will handle all files NOT defined below.
|
## This will handle all files NOT defined below.
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
## SOURCE CODE
|
# Source code
|
||||||
*.bat text eol=crlf
|
*.bat text eol=crlf
|
||||||
*.coffee text
|
*.coffee text
|
||||||
*.css text
|
*.css text
|
||||||
*.htm text diff=html
|
*.htm text diff=html
|
||||||
*.html text diff=html
|
*.html text diff=html
|
||||||
*.inc text
|
*.inc text
|
||||||
*.ini text
|
*.ini text
|
||||||
*.js text
|
*.js text
|
||||||
*.json text
|
*.json text
|
||||||
*.jsx text
|
*.jsx text
|
||||||
*.less text
|
*.less text
|
||||||
*.od text
|
*.od text
|
||||||
*.onlydata text
|
*.onlydata text
|
||||||
*.php text diff=php
|
*.php text diff=php
|
||||||
*.pl text
|
*.pl text
|
||||||
*.py text diff=python
|
*.py text diff=python
|
||||||
*.rb text diff=ruby
|
*.rb text diff=ruby
|
||||||
*.sass text
|
*.sass text
|
||||||
*.scm text
|
*.scm text
|
||||||
*.scss text
|
*.scss text
|
||||||
*.sh text eol=lf
|
*.sh text eol=lf
|
||||||
*.sql text
|
*.sql text
|
||||||
*.styl text
|
*.styl text
|
||||||
*.tag text
|
*.tag text
|
||||||
*.ts text
|
*.ts text
|
||||||
*.tsx text
|
*.tsx text
|
||||||
*.vue text
|
*.vue text
|
||||||
*.xml text
|
*.xml text
|
||||||
*.xhtml text diff=html
|
*.xhtml text diff=html
|
||||||
|
|
||||||
## DOCKER
|
# Docker
|
||||||
*.dockerignore text
|
*.dockerignore text
|
||||||
Dockerfile text
|
Dockerfile text
|
||||||
|
|
||||||
## DOCUMENTATION
|
# Documentation
|
||||||
*.ipynb text
|
*.ipynb text
|
||||||
*.markdown text
|
*.markdown text
|
||||||
*.md text
|
*.md text
|
||||||
*.mdwn text
|
*.mdwn text
|
||||||
*.mdown text
|
*.mdown text
|
||||||
*.mkd text
|
*.mkd text
|
||||||
*.mkdn text
|
*.mkdn text
|
||||||
*.mdtxt text
|
*.mdtxt text
|
||||||
*.mdtext text
|
*.mdtext text
|
||||||
*.txt text
|
*.txt text
|
||||||
AUTHORS text
|
AUTHORS text
|
||||||
CHANGELOG text
|
CHANGELOG text
|
||||||
CHANGES text
|
CHANGES text
|
||||||
CONTRIBUTING text
|
CONTRIBUTING text
|
||||||
COPYING text
|
COPYING text
|
||||||
copyright text
|
copyright text
|
||||||
*COPYRIGHT* text
|
*COPYRIGHT* text
|
||||||
INSTALL text
|
INSTALL text
|
||||||
license text
|
license text
|
||||||
LICENSE text
|
LICENSE text
|
||||||
NEWS text
|
NEWS text
|
||||||
readme text
|
readme text
|
||||||
*README* text
|
*README* text
|
||||||
TODO text
|
TODO text
|
||||||
|
|
||||||
## TEMPLATES
|
# Templates
|
||||||
*.dot text
|
*.dot text
|
||||||
*.ejs text
|
*.ejs text
|
||||||
*.haml text
|
*.haml text
|
||||||
*.handlebars text
|
*.handlebars text
|
||||||
*.hbs text
|
*.hbs text
|
||||||
*.hbt text
|
*.hbt text
|
||||||
*.jade text
|
*.jade text
|
||||||
*.latte text
|
*.latte text
|
||||||
*.mustache text
|
*.mustache text
|
||||||
*.njk text
|
*.njk text
|
||||||
*.phtml text
|
*.phtml text
|
||||||
*.tmpl text
|
*.tmpl text
|
||||||
*.tpl text
|
*.tpl text
|
||||||
*.twig text
|
*.twig text
|
||||||
|
|
||||||
## LINTERS
|
# Linters
|
||||||
.csslintrc text
|
.csslintrc text
|
||||||
.eslintrc text
|
.eslintrc text
|
||||||
.htmlhintrc text
|
.htmlhintrc text
|
||||||
.jscsrc text
|
.jscsrc text
|
||||||
.jshintrc text
|
.jshintrc text
|
||||||
.jshintignore text
|
.jshintignore text
|
||||||
.stylelintrc text
|
.stylelintrc text
|
||||||
|
|
||||||
## CONFIGS
|
# Configs
|
||||||
*.bowerrc text
|
*.bowerrc text
|
||||||
*.cnf text
|
*.cnf text
|
||||||
*.conf text
|
*.conf text
|
||||||
*.config text
|
*.config text
|
||||||
.babelrc text
|
.babelrc text
|
||||||
.browserslistrc text
|
.browserslistrc text
|
||||||
.editorconfig text
|
.editorconfig text
|
||||||
.env text
|
.env text
|
||||||
.gitattributes text
|
.gitattributes text
|
||||||
.gitconfig text
|
.gitconfig text
|
||||||
.htaccess text
|
.htaccess text
|
||||||
*.lock text
|
*.lock text
|
||||||
*.npmignore text
|
*.npmignore text
|
||||||
*.yaml text
|
*.yaml text
|
||||||
*.yml text
|
*.yml text
|
||||||
browserslist text
|
browserslist text
|
||||||
Makefile text
|
Makefile text
|
||||||
makefile text
|
makefile text
|
||||||
|
|
||||||
## HEROKU
|
# Heroku
|
||||||
Procfile text
|
Procfile text
|
||||||
.slugignore text
|
.slugignore text
|
||||||
|
|
||||||
## GRAPHICS
|
# Graphics
|
||||||
*.ai binary
|
*.ai binary
|
||||||
*.bmp binary
|
*.bmp binary
|
||||||
*.eps binary
|
*.eps binary
|
||||||
*.gif binary
|
*.gif binary
|
||||||
*.ico binary
|
*.ico binary
|
||||||
*.jng binary
|
*.jng binary
|
||||||
*.jp2 binary
|
*.jp2 binary
|
||||||
*.jpg binary
|
*.jpg binary
|
||||||
*.jpeg binary
|
*.jpeg binary
|
||||||
*.jpx binary
|
*.jpx binary
|
||||||
*.jxr binary
|
*.jxr binary
|
||||||
*.pdf binary
|
*.pdf binary
|
||||||
*.png binary
|
*.png binary
|
||||||
*.psb binary
|
*.psb binary
|
||||||
*.psd binary
|
*.psd binary
|
||||||
# SVG treated as an asset (binary) by default.
|
# SVG treated as an asset (binary) by default.
|
||||||
*.svg text
|
*.svg text
|
||||||
# If you want to treat it as text,
|
# If you want to treat it as text,
|
||||||
# use the following line instead.
|
# use the following line instead.
|
||||||
# *.svg binary
|
# *.svg binary
|
||||||
*.svgz binary
|
*.svgz binary
|
||||||
*.tif binary
|
*.tif binary
|
||||||
*.tiff binary
|
*.tiff binary
|
||||||
*.wbmp binary
|
*.wbmp binary
|
||||||
*.webp binary
|
*.webp binary
|
||||||
|
|
||||||
## AUDIO
|
# Audio
|
||||||
*.kar binary
|
*.kar binary
|
||||||
*.m4a binary
|
*.m4a binary
|
||||||
*.mid binary
|
*.mid binary
|
||||||
*.midi binary
|
*.midi binary
|
||||||
*.mp3 binary
|
*.mp3 binary
|
||||||
*.ogg binary
|
*.ogg binary
|
||||||
*.ra binary
|
*.ra binary
|
||||||
|
|
||||||
## VIDEO
|
# Video
|
||||||
*.3gpp binary
|
*.3gpp binary
|
||||||
*.3gp binary
|
*.3gp binary
|
||||||
*.as binary
|
*.as binary
|
||||||
*.asf binary
|
*.asf binary
|
||||||
*.asx binary
|
*.asx binary
|
||||||
*.fla binary
|
*.fla binary
|
||||||
*.flv binary
|
*.flv binary
|
||||||
*.m4v binary
|
*.m4v binary
|
||||||
*.mng binary
|
*.mng binary
|
||||||
*.mov binary
|
*.mov binary
|
||||||
*.mp4 binary
|
*.mp4 binary
|
||||||
*.mpeg binary
|
*.mpeg binary
|
||||||
*.mpg binary
|
*.mpg binary
|
||||||
*.ogv binary
|
*.ogv binary
|
||||||
*.swc binary
|
*.swc binary
|
||||||
*.swf binary
|
*.swf binary
|
||||||
*.webm binary
|
*.webm binary
|
||||||
|
|
||||||
## ARCHIVES
|
# Archives
|
||||||
*.7z binary
|
*.7z binary
|
||||||
*.gz binary
|
*.gz binary
|
||||||
*.jar binary
|
*.jar binary
|
||||||
*.rar binary
|
*.rar binary
|
||||||
*.tar binary
|
*.tar binary
|
||||||
*.zip binary
|
*.zip binary
|
||||||
|
|
||||||
## FONTS
|
# Fonts
|
||||||
*.ttf binary
|
*.ttf binary
|
||||||
*.eot binary
|
*.eot binary
|
||||||
*.otf binary
|
*.otf binary
|
||||||
*.woff binary
|
*.woff binary
|
||||||
*.woff2 binary
|
*.woff2 binary
|
||||||
|
|
||||||
## EXECUTABLES
|
# Executables
|
||||||
*.exe binary
|
*.exe binary
|
||||||
*.pyc binary
|
*.pyc binary
|
||||||
|
Loading…
Reference in New Issue
Block a user