summaryrefslogtreecommitdiff
path: root/Utilities/.gitattributes
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-31 13:40:34 -0400
committerBrad King <brad.king@kitware.com>2018-06-01 09:52:02 -0400
commit523c443d135f6474cf5a9d0372b3cc364fc7ebe5 (patch)
tree82f22000589d6ded60d2c325b221c5290cda3d3d /Utilities/.gitattributes
parenteb7ec19c1c639e91b812763ead3a56e97d20aec4 (diff)
downloadcmake-523c443d135f6474cf5a9d0372b3cc364fc7ebe5.tar.gz
clang-format.bash: update to clang-format-6.0
Update `.clang-format` with configuration to make the 6.0 format as close as possible to what 3.8 produced before. Then revise the style: * Indent preprocessor directives (a feature new since 3.8) * Add a newline and indentation before inheritance `:` and `,` Rename the Git attribute identifying the format to include the clang-format version number: `format.clang-format-6.0`. This will aid external infrastructure in knowing what version of the tool to run.
Diffstat (limited to 'Utilities/.gitattributes')
-rw-r--r--Utilities/.gitattributes4
1 files changed, 2 insertions, 2 deletions
diff --git a/Utilities/.gitattributes b/Utilities/.gitattributes
index bd978021ba..96a4323d93 100644
--- a/Utilities/.gitattributes
+++ b/Utilities/.gitattributes
@@ -3,5 +3,5 @@
SetupForDevelopment.sh export-ignore
# Do not format third-party sources.
-/KWIML/** -format.clang-format
-/cm*/** -format.clang-format
+/KWIML/** -format.clang-format-6.0
+/cm*/** -format.clang-format-6.0