Repository für MDT5/2 Praktikum
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.

.gitattributes 2.5KB

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