summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-05 13:48:20 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-05 13:48:20 +0900
commit6551e69fd458766a22f6929fa46ac3197d6a3267 (patch)
tree5aad945016804cfd10d6e1b1fe0796bf2e6311a3
parentMerge branch 'rs/use-free-and-null' (diff)
parentclang-format: add a comment about the meaning/status of the (diff)
downloadtgif-6551e69fd458766a22f6929fa46ac3197d6a3267.tar.xz
Merge branch 'sb/git-clang-format'
Add comment to clarify that the style file is meant to be used with clang-5 and the rules are still work in progress. * sb/git-clang-format: clang-format: add a comment about the meaning/status of the
-rw-r--r--.clang-format6
1 files changed, 5 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
index 56822c116b..611ab4750b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,8 @@
-# Defaults
+# This file is an example configuration for clang-format 5.0.
+#
+# Note that this style definition should only be understood as a hint
+# for writing new code. The rules are still work-in-progress and does
+# not yet exactly match the style we have in the existing code.
# Use tabs whenever we need to fill whitespace that spans at least from one tab
# stop to the next one.