mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-29 18:51:05 -05:00
Brad King
ea2a91a432
* upstream-KWSys: KWSys 2017-03-24 (7e9f7b7b) Resolve conflicts in `.gitattributes` by integrating changes from both sides. Keep the `our-c-style` attribute that KWSys uses, but drop their definition of it in favor of ours (Git only allows custom attributes in the top level anyway). Then add our own attribute line to unset the `format.clang-format` attribute for KWSys sources since we do not want to format third-party code ourselves.
16 lines
410 B
Plaintext
16 lines
410 B
Plaintext
.git* export-ignore
|
|
|
|
*.c our-c-style
|
|
*.c.in our-c-style
|
|
*.cxx our-c-style
|
|
*.h our-c-style
|
|
*.h.in our-c-style
|
|
*.hxx our-c-style
|
|
*.hxx.in our-c-style
|
|
|
|
*.cmake whitespace=tab-in-indent
|
|
*.rst whitespace=tab-in-indent conflict-marker-size=79
|
|
*.txt whitespace=tab-in-indent
|
|
|
|
* -format.clang-format
|