Skip to content
Snippets Groups Projects
Select Git revision
  • master
  • branchX default protected
  • Inventory
  • UIControls
  • fsv2
  • tonetest
  • from_nb
  • tonemapping
  • opt-shadows
  • BX-634
  • xCSG
  • hc
  • gizmos
  • gui2CSSLexer
  • msExporter
  • gui2
  • gui2Fix
  • pk
  • mesh_optimize
  • light_wip
  • version_X.11.2 protected
  • version_X.11.1 protected
  • version_X.11.1-dev protected
  • version_X.11.0-dev protected
  • version_X.10.1 protected
  • version_X.10.1-dev protected
  • version_X.10.0-dev protected
  • version_X.9.5 protected
  • version_X.9.4 protected
  • version_X.9.3 protected
  • version_X.9.3-dev protected
  • version_X.9.2-dev protected
  • version_X.9.1-dev protected
  • version_X.9.0-dev protected
  • version_X.8.2 protected
  • version_X.8.2-dev protected
  • version_X.8.1-dev protected
  • version_X.8.0-dev protected
  • version_X.7.1 protected
  • version_X.7.0 protected
40 results

.gitattributes

Blame
  • .gitattributes 2.46 KiB
    ###############################################################################
    # Set default behavior to automatically normalize line endings.
    ###############################################################################
    * text=auto
    
    ###############################################################################
    # Set default behavior for command prompt diff.
    #
    # This is need for earlier builds of msysgit that does not have it on by
    # default for csharp files.
    # Note: This is only used by command line
    ###############################################################################
    #*.cs     diff=csharp
    
    ###############################################################################
    # Set the merge driver for project and solution files
    #
    # 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
    # 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
    # these files as binary and thus will always conflict and require user
    # intervention with every merge. To do so, just uncomment the entries below
    ###############################################################################
    #*.sln       merge=binary
    #*.csproj    merge=binary
    #*.vbproj    merge=binary
    #*.vcxproj   merge=binary
    #*.vcproj    merge=binary
    #*.dbproj    merge=binary
    #*.fsproj    merge=binary
    #*.lsproj    merge=binary
    #*.wixproj   merge=binary
    #*.modelproj merge=binary
    #*.sqlproj   merge=binary
    #*.wwaproj   merge=binary
    
    ###############################################################################
    # behavior for image files
    #
    # image files are treated as binary by default.
    ###############################################################################
    #*.jpg   binary
    #*.png   binary
    #*.gif   binary
    
    ###############################################################################
    # diff behavior for common document formats
    # 
    # Convert binary document formats to text before diffing them. This feature
    # is only available from the command line. Turn it on by uncommenting the 
    # entries below.
    ###############################################################################
    #*.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