You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

71 lines
2.7 KiB

  1. ###############################################################################
  2. # Set default behavior to automatically normalize line endings.
  3. ###############################################################################
  4. * text=auto
  5. *.sh text eol=lf
  6. ###############################################################################
  7. # Set default behavior for command prompt diff.
  8. #
  9. # This is need for earlier builds of msysgit that does not have it on by
  10. # default for csharp files.
  11. # Note: This is only used by command line
  12. ###############################################################################
  13. #*.cs diff=csharp
  14. ###############################################################################
  15. # Set the merge driver for project and solution files
  16. #
  17. # Merging from the command prompt will add diff markers to the files if there
  18. # are conflicts (Merging from VS is not affected by the settings below, in VS
  19. # the diff markers are never inserted). Diff markers may cause the following
  20. # file extensions to fail to load in VS. An alternative would be to treat
  21. # these files as binary and thus will always conflict and require user
  22. # intervention with every merge. To do so, just uncomment the entries below
  23. ###############################################################################
  24. #*.sln merge=binary
  25. #*.csproj merge=binary
  26. #*.vbproj merge=binary
  27. #*.vcxproj merge=binary
  28. #*.vcproj merge=binary
  29. #*.dbproj merge=binary
  30. #*.fsproj merge=binary
  31. #*.lsproj merge=binary
  32. #*.wixproj merge=binary
  33. #*.modelproj merge=binary
  34. #*.sqlproj merge=binary
  35. #*.wwaproj merge=binary
  36. ###############################################################################
  37. # behavior for image files
  38. #
  39. # image files are treated as binary by default.
  40. ###############################################################################
  41. #*.jpg binary
  42. #*.png binary
  43. #*.gif binary
  44. ###############################################################################
  45. # diff behavior for common document formats
  46. #
  47. # Convert binary document formats to text before diffing them. This feature
  48. # is only available from the command line. Turn it on by uncommenting the
  49. # entries below.
  50. ###############################################################################
  51. #*.doc diff=astextplain
  52. #*.DOC diff=astextplain
  53. #*.docx diff=astextplain
  54. #*.DOCX diff=astextplain
  55. #*.dot diff=astextplain
  56. #*.DOT diff=astextplain
  57. #*.pdf diff=astextplain
  58. #*.PDF diff=astextplain
  59. #*.rtf diff=astextplain
  60. #*.RTF diff=astextplain
  61. ###############################################################################
  62. # Certificates are binary
  63. ###############################################################################
  64. *.pfx binary